From 4f70610730695bc061d5b494a425beda692ccd4c Mon Sep 17 00:00:00 2001
From: Xander Frangos <33106561+xanderfrangos@users.noreply.github.com>
Date: Sun, 4 Dec 2022 14:51:25 -0500
Subject: [PATCH] Added Update Channel option to Updates menu

---
 src/components/SettingsWindow.jsx | 20 +++++++++-----------
 src/localization/en.json          |  5 ++++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/SettingsWindow.jsx b/src/components/SettingsWindow.jsx
index 25dc8b18..f2d25ee3 100644
--- a/src/components/SettingsWindow.jsx
+++ b/src/components/SettingsWindow.jsx
@@ -1188,6 +1188,15 @@ export default class SettingsWindow extends PureComponent {
                             { this.renderToggle("checkForUpdates") }
                         </div>
 
+
+                        <div className="pageSection" data-active={this.isSection("updates")} style={{ display: (window.isAppX ? "none" : (this.isSection("updates") ? "block" : "none")) }}>
+                            <label>{T.t("SETTINGS_UPDATES_CHANNEL")}</label>
+                            <select value={this.state.rawSettings.branch} onChange={(e) => { window.sendSettings({ branch: e.target.value }) }}>
+                                <option value="master">{T.t("SETTINGS_UPDATES_BRANCH_STABLE")}</option>
+                                <option value="beta">{T.t("SETTINGS_UPDATES_BRANCH_BETA")}</option>
+                            </select>
+                        </div>
+
                         <div className="pageSection debug" data-active={this.isSection("debug")}>
                             <div className="sectionTitle">All Displays</div>
                             <label>Every detected display (including those not compatible) is listed below.</label>
@@ -1205,17 +1214,6 @@ export default class SettingsWindow extends PureComponent {
                             <p style={{ whiteSpace: "pre-wrap" }}>{JSON.stringify(this.state.rawSettings, undefined, 2)}</p>
                         </div>
 
-
-                        <div className="pageSection debug" data-active={this.isSection("debug")}>
-                            <div className="sectionTitle">Update channel</div>
-                            <p>
-                                <select value={this.state.rawSettings.branch} onChange={(e) => { window.sendSettings({ branch: e.target.value }) }}>
-                                    <option value="master">Stable (default)</option>
-                                    <option value="beta">Beta</option>
-                                </select>
-                            </p>
-                        </div>
-
                         <div className="pageSection debug" data-active={this.isSection("debug")}>
                             <div className="sectionTitle">Other</div>
                             <br />
diff --git a/src/localization/en.json b/src/localization/en.json
index 5b185738..a99e7f5e 100644
--- a/src/localization/en.json
+++ b/src/localization/en.json
@@ -145,5 +145,8 @@
     "SETTINGS_UPDATES_AVAILABLE": "New version of Twinkle Tray available!",
     "SETTINGS_UPDATES_NONE_AVAILABLE": "Up to date. The current version includes the following changes:",
     "SETTINGS_UPDATES_DOWNLOADING": "Downloading update…",
-    "SETTINGS_UPDATES_DOWNLOAD": "Download & Install {{1}}"
+    "SETTINGS_UPDATES_DOWNLOAD": "Download & Install {{1}}",
+    "SETTINGS_UPDATES_CHANNEL": "Update channel",
+    "SETTINGS_UPDATES_BRANCH_STABLE": "Stable (default)",
+    "SETTINGS_UPDATES_BRANCH_BETA": "Beta"
 }