Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure correct update channel is displayed in About window #2130

Merged
merged 1 commit into from
Aug 30, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/menus/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ module.exports = (createWindow, updatePlugins, getLoadedPluginVersions) => {
const config = getConfig();
const {commands} = getKeymaps();

const updateChannel = config.canaryUpdates ? 'canary' : 'stable';
let updateChannel = 'stable';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this logic should live inside the config, so that it's populated correctly whereever we need this? But OK for now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have different logics in those two places at the moment, but yep - definitely! 👍


if (config && config.updateChannel && config.updateChannel === 'canary') {
updateChannel = 'canary';
}

const showAbout = () => {
const loadedPlugins = getLoadedPluginVersions();
Expand Down