From eba96d483c8c2df13bab7a5ccdf602c5350073d0 Mon Sep 17 00:00:00 2001
From: Ammar Ahmed <ammarahmed6506@gmail.com>
Date: Fri, 7 Mar 2025 10:21:37 +0500
Subject: [PATCH] mobile: fix colors

---
 apps/mobile/app/components/header/index.tsx |  2 +-
 apps/mobile/app/screens/settings/index.tsx  | 42 +++++++++++----------
 apps/mobile/native/rspack.config.js         |  2 +-
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/apps/mobile/app/components/header/index.tsx b/apps/mobile/app/components/header/index.tsx
index 25e33134a..0e459de72 100644
--- a/apps/mobile/app/components/header/index.tsx
+++ b/apps/mobile/app/components/header/index.tsx
@@ -101,7 +101,7 @@ export const Header = ({
           borderRadius: 10,
           paddingVertical: DefaultAppStyles.GAP_VERTICAL_SMALL - 2,
           borderWidth: hasSearch ? 1 : 0,
-          borderColor: colors.secondary.border,
+          borderColor: colors.primary.border,
           paddingHorizontal: !hasSearch ? 0 : DefaultAppStyles.GAP_SMALL,
           alignItems: "center"
         }}
diff --git a/apps/mobile/app/screens/settings/index.tsx b/apps/mobile/app/screens/settings/index.tsx
index 6aec7bf2b..1443299e6 100644
--- a/apps/mobile/app/screens/settings/index.tsx
+++ b/apps/mobile/app/screens/settings/index.tsx
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import React from "react";
 import useNavigationStore from "../../stores/use-navigation-store";
-import { useThemeColors } from "@notesnook/theme";
+import { ScopedThemeProvider, useThemeColors } from "@notesnook/theme";
 import Group from "./group";
 import Home from "./home";
 import { RouteParams } from "./types";
@@ -36,26 +36,28 @@ export const Settings = () => {
         backgroundColor: colors.primary.background
       }}
     >
-      <SettingsStack.Navigator
-        initialRouteName="SettingsHome"
-        screenListeners={{
-          focus: (e) => {
-            if (e.target?.startsWith("SettingsHome-")) {
-              useNavigationStore.getState().update("Settings");
+      <ScopedThemeProvider value="list">
+        <SettingsStack.Navigator
+          initialRouteName="SettingsHome"
+          screenListeners={{
+            focus: (e) => {
+              if (e.target?.startsWith("SettingsHome-")) {
+                useNavigationStore.getState().update("Settings");
+              }
             }
-          }
-        }}
-        screenOptions={{
-          animation: "none",
-          headerShown: false,
-          contentStyle: {
-            backgroundColor: colors.primary.background
-          }
-        }}
-      >
-        <SettingsStack.Screen name="SettingsHome" component={Home} />
-        <SettingsStack.Screen name="SettingsGroup" component={Group} />
-      </SettingsStack.Navigator>
+          }}
+          screenOptions={{
+            animation: "none",
+            headerShown: false,
+            contentStyle: {
+              backgroundColor: colors.primary.background
+            }
+          }}
+        >
+          <SettingsStack.Screen name="SettingsHome" component={Home} />
+          <SettingsStack.Screen name="SettingsGroup" component={Group} />
+        </SettingsStack.Navigator>
+      </ScopedThemeProvider>
     </SafeAreaView>
   );
 };
diff --git a/apps/mobile/native/rspack.config.js b/apps/mobile/native/rspack.config.js
index 0746989d3..32d3e962b 100644
--- a/apps/mobile/native/rspack.config.js
+++ b/apps/mobile/native/rspack.config.js
@@ -229,7 +229,7 @@ module.exports = (env) => {
         logger: {
           console: false,
           listener: (e => {
-            if (e.message[0] === "Bundle built with warnings") {
+            if (e.message[0].includes("Bundle built with warnings")) {
               console.warn(`ℹ ` + e.message[0] + " time: " + e.message[1].time);
               return;
             }