From 025779126448b72ce27cee31d99d8d4d22ad7e87 Mon Sep 17 00:00:00 2001
From: felistachio <felix.fourcolor@gmail.com>
Date: Sun, 5 Oct 2025 21:02:02 -0700
Subject: [PATCH 1/2] Add segment list default tab config

---
 public/_locales                    |  2 +-
 public/options/options.html        | 11 +++++++++++
 src/config.ts                      |  4 +++-
 src/popup/SegmentListComponent.tsx | 19 ++++++++++++++-----
 src/types.ts                       |  5 +++++
 5 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/public/_locales b/public/_locales
index fcee4620b3..cf85b80e76 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit fcee4620b37c91603653df74891cb58fd0381ab7
+Subproject commit cf85b80e764c39285e60e0b8fd3217ae740a4fc0
diff --git a/public/options/options.html b/public/options/options.html
index e5333f8996..68c9f6fd3d 100644
--- a/public/options/options.html
+++ b/public/options/options.html
@@ -329,6 +329,17 @@
 							</label>
 						</div>
 					</div>
+
+					<br />
+
+					<div data-type="selector" data-sync="segmentListDefaultTab">
+						<label class="optionLabel" for="segmentListDefaultTab">__MSG_segmentListDefaultTab__:</label>
+
+						<select id="segmentListDefaultTab" class="selector-element optionsSelector">
+							<option value="0">__MSG_SegmentsCap__</option>
+							<option value="1">__MSG_Chapters__</option>
+						</select>
+					</div>
 				</div>
 
 				<div data-type="toggle" data-sync="darkMode">
diff --git a/src/config.ts b/src/config.ts
index 4261f66fca..27eba2ecd6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,6 +1,6 @@
 import * as CompileConfig from "../config.json";
 import * as invidiousList from "../ci/invidiouslist.json";
-import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType } from "./types";
+import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType, SegmentListDefaultTab } from "./types";
 import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
 import { HashedValue } from "../maze-utils/src/hash";
 import { Permission, AdvancedSkipRuleSet } from "./utils/skipRule";
@@ -10,6 +10,7 @@ interface SBConfig {
     isVip: boolean;
     permissions: Record<Category, Permission>;
     defaultCategory: Category;
+    segmentListDefaultTab: SegmentListDefaultTab;
     renderSegmentsAsChapters: boolean;
     forceChannelCheck: boolean;
     minutesSaved: number;
@@ -337,6 +338,7 @@ const syncDefaults = {
     isVip: false,
     permissions: {},
     defaultCategory: "chooseACategory" as Category,
+    segmentListDefaultTab: SegmentListDefaultTab.Segments,
     renderSegmentsAsChapters: false,
     forceChannelCheck: false,
     minutesSaved: 0,
diff --git a/src/popup/SegmentListComponent.tsx b/src/popup/SegmentListComponent.tsx
index d56b7baee5..1369475ca3 100644
--- a/src/popup/SegmentListComponent.tsx
+++ b/src/popup/SegmentListComponent.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ActionType, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "../types";
+import { ActionType, SegmentListDefaultTab, SegmentUUID, SponsorHideType, SponsorTime, VideoID } from "../types";
 import Config from "../config";
 import { waitFor } from "../../maze-utils/src";
 import { shortCategoryName } from "../utils/categoryUtils";
@@ -61,12 +61,21 @@ export const SegmentListComponent = (props: SegmentListComponentProps) => {
     }, [props.segments]);
 
     React.useEffect(() => {
-        if (hasSegments){
-            setTab(SegmentListTab.Segments);
+        const setTabBasedOnConfig = () => {
+            const preferChapters = Config.config.segmentListDefaultTab === SegmentListDefaultTab.Chapters;
+            if (preferChapters) {
+                setTab(hasChapters ? SegmentListTab.Chapter : SegmentListTab.Segments);
+            } else {
+                setTab(hasSegments ? SegmentListTab.Segments : SegmentListTab.Chapter);
+            }
+        };
+
+        if (Config.isReady()) {
+            setTabBasedOnConfig();
         } else {
-            setTab(SegmentListTab.Chapter);
+            waitFor(() => Config.isReady()).then(setTabBasedOnConfig);
         }
-    }, [props.videoID, hasSegments]);
+    }, [props.videoID, hasSegments, hasChapters]);
 
     const segmentsWithNesting = React.useMemo(() => {
         const result: SegmentWithNesting[] = [];
diff --git a/src/types.ts b/src/types.ts
index d8346f58ea..7438557d0b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -227,4 +227,9 @@ export enum NoticeVisibilityMode {
     MiniForAll = 2,
     FadedForAutoSkip = 3,
     FadedForAll = 4
+}
+
+export enum SegmentListDefaultTab {
+    Segments,
+    Chapters,
 }
\ No newline at end of file

From d0978bff799c07ed2da1f855566f0c14f3e4a3a6 Mon Sep 17 00:00:00 2001
From: Ajay <dev@ajay.app>
Date: Mon, 6 Oct 2025 13:15:37 -0400
Subject: [PATCH 2/2] update translations

---
 public/_locales | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/_locales b/public/_locales
index cf85b80e76..32c293e861 160000
--- a/public/_locales
+++ b/public/_locales
@@ -1 +1 @@
-Subproject commit cf85b80e764c39285e60e0b8fd3217ae740a4fc0
+Subproject commit 32c293e8617e9be661fc8b19912858340a1df4f1