Custom user ID validation should no longer show when disabled. (#1946)

microsoft · Nov 5, 2019 · 9c4a6ce · 9c4a6ce
1 parent 855fdec
commit 9c4a6ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ## Fixed
 - [client] Added an empty state for the recent bots submenu in the app menu for Windows in PR [1945](https://github.com/microsoft/BotFramework-Emulator/pull/1945)
+- [client] Fixed a bug that was showing the custom user ID validation message when disabled in PR [1946](https://github.com/microsoft/BotFramework-Emulator/pull/1946)
 
 ## v4.6.0 - 2019 - 10 - 31
 ## Added

diff --git a/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.tsx b/packages/app/client/src/ui/editor/appSettingsEditor/appSettingsEditor.tsx
@@ -226,7 +226,7 @@ export class AppSettingsEditor extends React.Component<AppSettingsEditorProps, A
                   name="userGUID"
                   onChange={this.onInputChange}
                   required={useCustomId}
-                  errorMessage={userGUID ? '' : 'Enter a User ID'}
+                  errorMessage={useCustomId && !userGUID ? 'Enter a User ID' : ''}
                 />
               </Row>
             </fieldset>