Merge branch 'develop' into fix/progress-bar-items

Revert package.json changes
2026-05-31 11:08:26 +01:00 · 2026-05-31 11:44:00 +02:00 · 2026-05-31 19:00:56 +10:00 · 2026-05-31 18:57:30 +10:00 · 2026-05-31 16:13:06 +10:00 · 2026-05-31 15:49:11 +10:00
1 changed files with 6 additions and 5 deletions
--- a/components/common/ProgressBar.tsx
+++ b/components/common/ProgressBar.tsx
@@ -37,11 +37,12 @@ export const ProgressBar: React.FC<ProgressBarProps> = ({ item }) => {
        }
      />
      <View
-        style={{
-          width: `${progress}%`,
-          backgroundColor: Platform.isTV ? "#ffffff" : undefined,
-        }}
-        className={`absolute bottom-0 left-0 h-1 w-full ${Platform.isTV ? "" : "bg-purple-600"}`}
+        style={
+          Platform.isTV
+            ? { width: `${progress}%`, backgroundColor: "#ffffff" }
+            : { width: `${progress}%` }
+        }
+        className={`absolute bottom-0 left-0 h-1 ${Platform.isTV ? "" : "bg-purple-600"}`}
      />
    </>
  );
Author	SHA1	Message	Date
Gauvain	e0cd620e9c	Merge branch 'develop' into fix/progress-bar-items	2026-05-31 11:44:00 +02:00
Alex Kim	c895774799	Revert package.json changes	2026-05-31 19:00:56 +10:00
Alex Kim	8c65d8bb8b	Merge branch 'develop' into fix/progress-bar-items	2026-05-31 18:57:30 +10:00
Alex Kim	c82f0c7c15	Add react native-tab dep	2026-05-31 16:13:06 +10:00
Alex Kim	3bd5f0c2c3	fix(progress-bar): Fix progress bar not reporting watch times	2026-05-31 15:49:11 +10:00