Merge 011b5d2 into a09da63

microsoft · Dec 9, 2019 · 5b70c3e · 5b70c3e
2 parents a09da63 + 011b5d2
commit 5b70c3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - [2009](https://github.com/microsoft/BotFramework-Emulator/pull/2009)
   - [2010](https://github.com/microsoft/BotFramework-Emulator/pull/2010)
   - [2012](https://github.com/microsoft/BotFramework-Emulator/pull/2012)
+  - [2014](https://github.com/microsoft/BotFramework-Emulator/pull/2014)
   - [2017](https://github.com/microsoft/BotFramework-Emulator/pull/2017)
   - [2019](https://github.com/microsoft/BotFramework-Emulator/pull/2019)
 

diff --git a/packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.tsx b/packages/app/client/src/ui/dialogs/openBotDialog/openBotDialog.tsx
@@ -126,7 +126,6 @@ export class OpenBotDialog extends Component<OpenBotDialogProps, OpenBotDialogSt
     const errorMessage = OpenBotDialog.getErrorMessage(validationResult);
     const shouldBeDisabled =
       validationResult === ValidationResult.Invalid || validationResult === ValidationResult.Empty;
-    const botUrlLabel = 'Bot URL';
 
     return (
       <Dialog cancel={this.props.onDialogCancel} className={openBotStyles.themeOverrides} title="Open a bot">
@@ -135,10 +134,10 @@ export class OpenBotDialog extends Component<OpenBotDialogProps, OpenBotDialogSt
             <AutoComplete
               autoFocus={true}
               errorMessage={errorMessage}
-              label={botUrlLabel}
+              label={'Bot URL'}
               items={savedBotUrls.map(elem => elem.url).slice(0, 9)}
               onChange={this.onBotUrlChange}
-              placeholder={botUrlLabel}
+              placeholder={'Enter your bot URL'}
               value={this.state.botUrl}
             />
             {this.browseButton}