From 1d565a7cbd6e049ef090a05c0e194fcb128dcca7 Mon Sep 17 00:00:00 2001
From: CJ <72030708+cj12312021@users.noreply.github.com>
Date: Mon, 13 May 2024 21:02:59 -0500
Subject: [PATCH] Enable track activity by default (#4710)

* enable track Activity by default
* Add v0.26.0 release notes and update "Track Activity" label
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
---
 ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx          | 2 +-
 .../SettingsInterfacePanel/SettingsInterfacePanel.tsx       | 2 +-
 ui/v2.5/src/docs/en/ReleaseNotes/index.ts                   | 6 ++++++
 ui/v2.5/src/docs/en/ReleaseNotes/v0260.md                   | 1 +
 ui/v2.5/src/locales/en-GB.json                              | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 ui/v2.5/src/docs/en/ReleaseNotes/v0260.md

diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index e8bd76382..88bda1c88 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -248,7 +248,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
   const auto = useRef(false);
   const interactiveReady = useRef(false);
   const minimumPlayPercent = uiConfig?.minimumPlayPercent ?? 0;
-  const trackActivity = uiConfig?.trackActivity ?? false;
+  const trackActivity = uiConfig?.trackActivity ?? true;
   const vrTag = uiConfig?.vrTag ?? undefined;
 
   useScript(
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 9f23beee2..0419f3bd3 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -301,7 +301,7 @@ export const SettingsInterfacePanel: React.FC = () => {
         <BooleanSetting
           id="track-activity"
           headingID="config.ui.scene_player.options.track_activity"
-          checked={ui.trackActivity ?? undefined}
+          checked={ui.trackActivity ?? true}
           onChange={(v) => saveUI({ trackActivity: v })}
         />
         <StringSetting
diff --git a/ui/v2.5/src/docs/en/ReleaseNotes/index.ts b/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
index 31bb8e597..c3018eb15 100644
--- a/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
+++ b/ui/v2.5/src/docs/en/ReleaseNotes/index.ts
@@ -2,6 +2,7 @@ import v0170 from "./v0170.md";
 import v0200 from "./v0200.md";
 import v0240 from "./v0240.md";
 import v0250 from "./v0250.md";
+import v0260 from "./v0260.md";
 
 export interface IReleaseNotes {
   // handle should be in the form of YYYYMMDD
@@ -11,6 +12,11 @@ export interface IReleaseNotes {
 }
 
 export const releaseNotes: IReleaseNotes[] = [
+  {
+    date: 20240510,
+    version: "v0.26.0",
+    content: v0260,
+  },
   {
     date: 20240228,
     version: "v0.25.0",
diff --git a/ui/v2.5/src/docs/en/ReleaseNotes/v0260.md b/ui/v2.5/src/docs/en/ReleaseNotes/v0260.md
new file mode 100644
index 000000000..b31fe48db
--- /dev/null
+++ b/ui/v2.5/src/docs/en/ReleaseNotes/v0260.md
@@ -0,0 +1 @@
+The `Enable Scene Play History` setting has been set to true for existing systems. This setting enables play counts and resuming scenes from where they were previously played. If you do not want this enabled, please disable it explicitly in `Settings -> Interface -> Scene Player -> Enable Scene Play History`.
\ No newline at end of file
diff --git a/ui/v2.5/src/locales/en-GB.json b/ui/v2.5/src/locales/en-GB.json
index c752e5b73..f57c21ebf 100644
--- a/ui/v2.5/src/locales/en-GB.json
+++ b/ui/v2.5/src/locales/en-GB.json
@@ -737,7 +737,7 @@
           "enable_chromecast": "Enable Chromecast",
           "show_ab_loop_controls": "Show AB Loop plugin controls",
           "show_scrubber": "Show Scrubber",
-          "track_activity": "Track Activity",
+          "track_activity": "Enable Scene Play history",
           "vr_tag": {
             "description": "The VR button will only be displayed for scenes with this tag.",
             "heading": "VR Tag"