Merge upstream develop

Author: github-actions[bot]

.gitlab-ci.yml

@@ -16,6 +16,9 @@ stages:
   - publish
   - deploy
   - test
+variables:
+  CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
+  CARGO_TARGET_DIR: ${CI_PROJECT_DIR}/target
 default:
   tags:
     - dind_fast

.gitlab/ci/build_rn_sdk.yml

@@ -24,10 +24,19 @@ rn-android-build:
   cache:
     - key:
         files:
+          - packages/rs-core/Cargo.lock
+        prefix: rs-core-cargo-deps
+      paths:
+        - .cargo/registry/index
+        - .cargo/registry/cache
+        - .cargo/git/db
+    - key:
+        files:
+          - packages/rs-core/Cargo.lock
           - pnpm-lock.yaml
-        prefix: ubrn-target
+        prefix: rs-core-target-${CI_JOB_NAME}
       paths:
-        - node_modules/.pnpm/uniffi-bindgen-react-native@*/node_modules/uniffi-bindgen-react-native/target
+        - target
   script:
     - cd packages/react-native
     - |

.gitlab/ci/build_rs_core.yml

@@ -15,7 +15,6 @@
         - .gitlab/ci/build_rs_core.yml
   variables:
     RUST_CORE_PATH: packages/rs-core
-    CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
   cache:
     - key:
         files:
@@ -76,15 +75,10 @@ rs-core-uniffi-web-build:
     - key:
         files:
           - packages/rs-core/Cargo.lock
+          - pnpm-lock.yaml
         prefix: rs-core-target-${CI_JOB_NAME}
       paths:
         - target
-    - key:
-        files:
-          - pnpm-lock.yaml
-        prefix: ubrn-target
-      paths:
-        - node_modules/.pnpm/uniffi-bindgen-react-native@*/node_modules/uniffi-bindgen-react-native/target
   script:
     - cd packages/rs-core-uniffi-web
     - |

.gitlab/ci/setup_images.yml

@@ -29,4 +29,6 @@ setup-image-rust:
         --frontend dockerfile.v0 \
         --local context=.gitlab/images/rust \
         --local dockerfile=.gitlab/images/rust \
+        --import-cache type=registry,ref=$RUST_IMAGE \
+        --export-cache type=inline \
         --output type=image,name=$RUST_IMAGE,push=true

apps/polycentric/src/common/components/layout/Layout.tsx

@@ -13,15 +13,16 @@ import {
 import {
   KeyboardAvoidingView,
   Platform,
-  Pressable,
+  // Pressable,
   useWindowDimensions,
   View,
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import { IdentityFooter } from '@/src/features/core/identity/IdentityFooter';
 import { Ionicons } from '@expo/vector-icons';
-import WEB_LOGO from '../../assets/images/polycentric-logo-blue-256.png';
+import BLUE_LOGO from '../../assets/images/polycentric-logo-blue-256.png';
+import WHITE_LOGO from '../../assets/images/polycentric-logo-white-256.png';
 import { FUTO_URL, openCompose } from '../../constants';
 import { useCurrentIdentity } from '../../lib/polycentric-hooks';
 import { Button } from '../primitives';
@@ -183,6 +184,7 @@ export const LeftSidebar = memo(function LeftSidebar({
   ...props
 }: LeftSidebarProps) {
   const { width: deviceWidth } = useWindowDimensions();
+  const { theme } = useTheme();
 
   const { identity } = useCurrentIdentity();
 
@@ -237,7 +239,7 @@ export const LeftSidebar = memo(function LeftSidebar({
                 ]}
               >
                 <Image
-                  source={WEB_LOGO}
+                  source={theme.scheme === 'dark' ? WHITE_LOGO : BLUE_LOGO}
                   contentFit="contain"
                   style={{ width: 30, height: 30 }}
                 />