From 9eb5123c03db623cdbe83d9c7e86b479e82f6aa0 Mon Sep 17 00:00:00 2001
From: s1to <sito0@riseup.net>
Date: Sun, 26 Jul 2026 14:18:42 +0200
Subject: [PATCH] Load Oasis-Mobile-UX theme directly on mobile

Drops the conditional/selectable-theme loading that broke the CSS;
matches the known-working build.
---
 src/views/main_views.js    | 18 ++++--------------
 src/views/settings_view.js |  3 +--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/views/main_views.js b/src/views/main_views.js
index c362d59..8fb458e 100644
--- a/src/views/main_views.js
+++ b/src/views/main_views.js
@@ -1299,14 +1299,9 @@ const template = (titlePrefix, ...elements) => {
   const currentConfig = getConfig();
   const theme = currentConfig.themes.current || "Dark-SNH";
   const uxMode = currentConfig.ux?.current === "ainav" ? "ainav" : "blocks";
-  const baseTheme = theme === "OasisMobileUX" ? "Dark-SNH" : theme;
-  const mobileUXActive = process.env.OASIS_MOBILE === '1' ? theme !== "OasisMobile" : theme === "OasisMobileUX";
-  const mobileUXLink = mobileUXActive
-    ? link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) })
-    : "";
   const themeLink = link({
     rel: "stylesheet",
-    href: `/assets/themes/${baseTheme}.css`
+    href: `/assets/themes/${theme}.css`
   });
   const nodes = html(
     { lang: "en" },
@@ -1315,7 +1310,7 @@ const template = (titlePrefix, ...elements) => {
       link({ rel: "stylesheet", href: "/assets/styles/style.css" }),
       themeLink,
       link({ rel: "stylesheet", href: "/assets/styles/mobile.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
-      mobileUXLink,
+      link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
       link({ rel: "icon", href: "/assets/images/favicon.svg" }),
       meta({ charset: "utf-8" }),
       meta({ name: "description", content: i18n.oasisDescription }),
@@ -1631,20 +1626,15 @@ exports.template = template;
 exports.ainavHomeView = ({ recentTags = [] } = {}) => {
   const currentConfig = getConfig();
   const theme = currentConfig.themes.current || "Dark-SNH";
-  const baseTheme = theme === "OasisMobileUX" ? "Dark-SNH" : theme;
-  const mobileUXActive = process.env.OASIS_MOBILE === '1' ? theme !== "OasisMobile" : theme === "OasisMobileUX";
-  const mobileUXLink = mobileUXActive
-    ? link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) })
-    : "";
   const placeholder = i18n.aiNavPlaceholder || 'Where do you want to go?';
   const nodes = html(
     { lang: "en" },
     head(
       title(placeholder, " | Oasis"),
       link({ rel: "stylesheet", href: "/assets/styles/style.css" }),
-      link({ rel: "stylesheet", href: `/assets/themes/${baseTheme}.css` }),
+      link({ rel: "stylesheet", href: `/assets/themes/${theme}.css` }),
       link({ rel: "stylesheet", href: "/assets/styles/mobile.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
-      mobileUXLink,
+      link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
       link({ rel: "icon", href: "/assets/images/favicon.svg" }),
       meta({ charset: "utf-8" }),
       meta({ name: "description", content: i18n.oasisDescription }),
diff --git a/src/views/settings_view.js b/src/views/settings_view.js
index bebe8ae..0969d08 100644
--- a/src/views/settings_view.js
+++ b/src/views/settings_view.js
@@ -37,8 +37,7 @@ const settingsView = ({ version, aiPrompt, fediverseAccount, fediverseError }) =
     option({ value: "Clear-SNH", selected: theme === "Clear-SNH" ? true : undefined }, "Clear-SNH"),
     option({ value: "Purple-SNH", selected: theme === "Purple-SNH" ? true : undefined }, "Purple-SNH"),
     option({ value: "Matrix-SNH", selected: theme === "Matrix-SNH" ? true : undefined }, "Matrix-SNH"),
-    option({ value: "OasisMobile", selected: theme === "OasisMobile" ? true : undefined }, "Oasis-Mobile"),
-    option({ value: "OasisMobileUX", selected: theme === "OasisMobileUX" ? true : undefined }, "Oasis-Mobile-UX")
+    option({ value: "OasisMobile", selected: theme === "OasisMobile" ? true : undefined }, "Oasis-Mobile")
   ];
 
   const languageOption = (longName, shortName) => {