From 6c13bd9ab3891c5a9d786f66f6bd845a77a16d59 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Fri, 24 Apr 2026 02:01:18 +0700
Subject: [PATCH] chore(lint): hoist SheetBackground combined style

---
 .../src/components/adaptive-modal-sheet.tsx   | 22 +++++------
 packages/server/src/server/package-version.ts | 39 +++++++++++--------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/packages/app/src/components/adaptive-modal-sheet.tsx b/packages/app/src/components/adaptive-modal-sheet.tsx
index fd6e131bc..c54f2fc2f 100644
--- a/packages/app/src/components/adaptive-modal-sheet.tsx
+++ b/packages/app/src/components/adaptive-modal-sheet.tsx
@@ -143,18 +143,18 @@ const styles = StyleSheet.create((theme) => ({
 
 function SheetBackground({ style }: BottomSheetBackgroundProps) {
   const { theme } = useUnistyles();
-  return (
-    <View
-      style={[
-        style,
-        {
-          backgroundColor: theme.colors.surface1,
-          borderTopLeftRadius: theme.borderRadius.xl,
-          borderTopRightRadius: theme.borderRadius.xl,
-        },
-      ]}
-    />
+  const combinedStyle = useMemo(
+    () => [
+      style,
+      {
+        backgroundColor: theme.colors.surface1,
+        borderTopLeftRadius: theme.borderRadius.xl,
+        borderTopRightRadius: theme.borderRadius.xl,
+      },
+    ],
+    [style, theme.colors.surface1, theme.borderRadius.xl],
   );
+  return <View style={combinedStyle} />;
 }
 
 export interface AdaptiveModalSheetProps {
diff --git a/packages/server/src/server/package-version.ts b/packages/server/src/server/package-version.ts
index b83b076f8..6b890aaad 100644
--- a/packages/server/src/server/package-version.ts
+++ b/packages/server/src/server/package-version.ts
@@ -19,6 +19,26 @@ export class PackageVersionResolutionError extends Error {
   }
 }
 
+function readMatchingPackageVersion(
+  packageJsonPath: string,
+  packageName: string,
+  moduleUrl: string,
+): string | null {
+  let packageJson: PackageJson;
+  try {
+    packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")) as PackageJson;
+  } catch {
+    return null;
+  }
+  if (packageJson.name !== packageName) {
+    return null;
+  }
+  if (typeof packageJson.version === "string" && packageJson.version.trim().length > 0) {
+    return packageJson.version.trim();
+  }
+  throw new PackageVersionResolutionError({ moduleUrl, packageName });
+}
+
 export function resolvePackageVersion(params: ResolvePackageVersionParams): string {
   const moduleUrl = params.moduleUrl ?? import.meta.url;
   let currentDir = path.dirname(fileURLToPath(moduleUrl));
@@ -26,22 +46,9 @@ export function resolvePackageVersion(params: ResolvePackageVersionParams): stri
   while (true) {
     const packageJsonPath = path.join(currentDir, "package.json");
     if (existsSync(packageJsonPath)) {
-      try {
-        const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8")) as PackageJson;
-        if (packageJson.name === params.packageName) {
-          if (typeof packageJson.version === "string" && packageJson.version.trim().length > 0) {
-            return packageJson.version.trim();
-          }
-          throw new PackageVersionResolutionError({
-            moduleUrl,
-            packageName: params.packageName,
-          });
-        }
-      } catch (error) {
-        if (error instanceof PackageVersionResolutionError) {
-          throw error;
-        }
-        // Continue searching parent directories.
+      const version = readMatchingPackageVersion(packageJsonPath, params.packageName, moduleUrl);
+      if (version !== null) {
+        return version;
       }
     }