Merge branch 'main' into dev

# Conflicts:
#	app/(auth)/_layout.tsx
This commit is contained in:
Milan Paunovic
2024-10-09 17:34:15 +02:00
7 changed files with 18465 additions and 15 deletions
+6 -10
View File
@@ -1,15 +1,11 @@
import SettingsPage from "@/components/pages/settings/SettingsPage";
import { AuthContextProvider } from "@/contexts/AuthContext";
import { SettingsContextProvider } from "@/contexts/SettingsContext";
import {SettingsContextProvider} from "@/contexts/SettingsContext";
import React from "react";
import { View } from "react-native-ui-lib";
export default function Screen() {
return (
<AuthContextProvider>
<SettingsContextProvider>
<SettingsPage />
</SettingsContextProvider>
</AuthContextProvider>
);
return (
<SettingsContextProvider>
<SettingsPage/>
</SettingsContextProvider>
);
}