Merge upstream develop

Author: github-actions[bot]

.gitlab-ci.yml

@@ -1,16 +1,16 @@
 include:
-- local: ".gitlab/ci/build_rs_core.yml"
-- local: ".gitlab/ci/build_js_sdks.yml"
-- local: ".gitlab/ci/build_server.yml"
-- local: ".gitlab/ci/deploy_pages.yml"
-- local: ".gitlab/ci/scan_dependencies.yml"
+  - local: '.gitlab/ci/build_rs_core.yml'
+  - local: '.gitlab/ci/build_js_sdks.yml'
+  - local: '.gitlab/ci/build_server.yml'
+  - local: '.gitlab/ci/deploy_pages.yml'
+  - local: '.gitlab/ci/scan_dependencies.yml'
 stages:
-- setup
-- check
-- build
-- publish
-- deploy
-- test
+  - setup
+  - check
+  - build
+  - publish
+  - deploy
+  - test
 default:
   tags:
-  - dind
+    - dind

.gitlab/ci/scan_dependencies.yml

@@ -2,10 +2,10 @@ trivy:
   stage: test
   image:
     name: aquasec/trivy:0.69.3
-    entrypoint: [""]
+    entrypoint: ['']
   variables:
-    TRIVY_NO_PROGRESS: "true"
-    TRIVY_CACHE_DIR: ".trivycache/"
+    TRIVY_NO_PROGRESS: 'true'
+    TRIVY_CACHE_DIR: '.trivycache/'
   allow_failure: true
   script:
     # Gitlab code quality report output

apps/polycentric/app/(onboarding)/_layout.tsx

@@ -1,5 +1,14 @@
+import { ToastProvider } from '@/src/common/lib/toast';
+import { Atoms } from '@/src/common/theme';
 import { Stack } from 'expo-router';
+import { View } from 'react-native';
 
 export default function OnboardingLayout() {
-  return <Stack screenOptions={{ headerShown: false }} />;
+  return (
+    <View style={[Atoms.flex_1, Atoms.items_center]}>
+      <ToastProvider contentColumn>
+        <Stack screenOptions={{ headerShown: false }} />
+      </ToastProvider>
+    </View>
+  );
 }

apps/polycentric/app/(tabs)/_layout.tsx

@@ -1 +1,34 @@
-export { default } from '@/src/common/navigation/TabsLayoutScreen';
+import { isWeb } from '@/src/common/util/platform';
+import { WideShell } from '@/src/features/wideshell';
+import { Slot } from 'expo-router';
+import { NativeTabs } from 'expo-router/unstable-native-tabs';
+
+export default function TabsLayout() {
+  if (isWeb) {
+    return <Slot />;
+  }
+
+  return (
+    <NativeTabs>
+      <NativeTabs.Trigger name="feed">
+        <NativeTabs.Trigger.Label>Feed</NativeTabs.Trigger.Label>
+        <NativeTabs.Trigger.Icon sf="house.fill" md="home" />
+      </NativeTabs.Trigger>
+
+      <NativeTabs.Trigger name="search">
+        <NativeTabs.Trigger.Label>Search</NativeTabs.Trigger.Label>
+        <NativeTabs.Trigger.Icon sf="magnifyingglass" md="search" />
+      </NativeTabs.Trigger>
+
+      <NativeTabs.Trigger name="activity">
+        <NativeTabs.Trigger.Label>Activity</NativeTabs.Trigger.Label>
+        <NativeTabs.Trigger.Icon sf="bell.fill" md="notifications" />
+      </NativeTabs.Trigger>
+
+      <NativeTabs.Trigger name="settings">
+        <NativeTabs.Trigger.Label>Settings</NativeTabs.Trigger.Label>
+        <NativeTabs.Trigger.Icon sf="gearshape.fill" md="settings" />
+      </NativeTabs.Trigger>
+    </NativeTabs>
+  );
+}

…olycentric/app/(tabs)/activity/index.tsx apps/polycentric/app/(tabs)/activity.tsxapps/polycentric/app/(tabs)/activity/index.tsx renamed to apps/polycentric/app/(tabs)/activity.tsx apps/polycentric/app/(tabs)/activity/index.tsx renamed to apps/polycentric/app/(tabs)/activity.tsx

@@ -0,0 +1,5 @@
+import FeedTabScreen from '@/src/features/feed/FeedScreen';
+
+export default function FeedIndexRoute() {
+  return <FeedTabScreen />;
+}