From 67850b8c9dd23d335ec1ba956d6c867bc7612a6f Mon Sep 17 00:00:00 2001
From: Srinaath Ravichandran <srinaath27@gmail.com>
Date: Thu, 10 Dec 2020 14:31:02 -0800
Subject: [PATCH] Fetch merged settings on reload (#5289)

---
 .../packages/client/src/recoilModel/dispatchers/project.ts   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Composer/packages/client/src/recoilModel/dispatchers/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/project.ts
index b5346f85fc..3b1c0df7ab 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/project.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/project.ts
@@ -31,6 +31,7 @@ import {
   filePersistenceState,
   locationState,
   projectMetaDataState,
+  settingsState,
   showCreateQnAFromUrlDialogState,
 } from '../atoms';
 import { dispatcherState } from '../DispatcherWrapper';
@@ -465,8 +466,12 @@ export const projectDispatcher = () => {
 
   /** Resets the file persistence of a project, and then reloads the bot state. */
   const reloadProject = useRecoilCallback((callbackHelpers: CallbackInterface) => async (projectId: string) => {
+    const { snapshot } = callbackHelpers;
     callbackHelpers.reset(filePersistenceState(projectId));
     const { projectData, botFiles } = await fetchProjectDataById(projectId);
+
+    // Reload needs to pull the settings from the local storage persisted in the current settingsState of the project
+    botFiles.mergedSettings = await snapshot.getPromise(settingsState(projectId));
     await initBotState(callbackHelpers, projectData, botFiles);
   });