Merge branch 'master' into feature/southworks/choose-userId

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [build / client] Fixed ipc issue that was breaking the command service in PR [1418](https://github.com/Microsoft/BotFramework-Emulator/pull/1418)
 - [build] Bumped electron version to v4.1.1 and updated .dmg installer background image in PR [1419](https://github.com/Microsoft/BotFramework-Emulator/pull/1419)
 - [ui-react] Added default disabled styling to checkbox control in PR [1424](https://github.com/Microsoft/BotFramework-Emulator/pull/1424)
+- [client] Fixed issue where BOM wasn't being stripped from transcripts opened via the File menu in PR [1425](https://github.com/Microsoft/BotFramework-Emulator/pull/1425)
 
 ## v4.3.3 - 2019 - 03 - 14
 ## Fixed

packages/app/main/src/commands/emulatorCommands.spec.ts

@@ -71,7 +71,6 @@ jest.mock('chokidar', () => ({
 
 jest.mock('fs-extra', () => ({
   stat: async () => ({ isFile: () => true }),
-  readFile: async () => JSON.stringify((mockConversation as any).transcript),
 }));
 
 jest.mock('mkdirp', () => ({
@@ -94,6 +93,7 @@ jest.mock('../utils', () => ({
   writeFile: async () => true,
   loadSettings: () => ({ windowState: {} }),
   getThemes: async () => [],
+  readFileSync: () => JSON.stringify((mockConversation as any).transcript),
 }));
 
 jest.mock('../utils/ensureStoragePath', () => ({

packages/app/main/src/commands/emulatorCommands.ts

@@ -45,7 +45,7 @@ import { getActiveBot, getBotInfoByPath, patchBotsJson, toSavableBot } from '../
 import { emulator } from '../emulator';
 import { mainWindow } from '../main';
 import { dispatch, getStore as getSettingsStore } from '../settingsData/store';
-import { parseActivitiesFromChatFile, showSaveDialog, writeFile } from '../utils';
+import { parseActivitiesFromChatFile, showSaveDialog, writeFile, readFileSync } from '../utils';
 import { cleanupId as cleanupActivityChannelAccountId, CustomActivity } from '../utils/conversation';
 import { botProjectFileWatcher } from '../watchers';
 import { TelemetryService } from '../telemetry';
@@ -125,7 +125,7 @@ export function registerCommands(commandRegistry: CommandRegistryImpl) {
         throw new Error(`${Commands.FeedTranscriptFromDisk}: File ${filePath} not found.`);
       }
 
-      const activities = JSON.parse(await fs.readFile(transcriptPath, 'utf-8'));
+      const activities = JSON.parse(readFileSync(transcriptPath));
 
       await mainWindow.commandService.call(
         Commands.FeedTranscriptFromMemory,