From bf93d978745b88a014b2c5275e02cce0293638fa Mon Sep 17 00:00:00 2001 From: Utku <74243531+utkubakir@users.noreply.github.com> Date: Thu, 26 Oct 2023 20:38:15 +0300 Subject: [PATCH] Fix mobile onboarding (#1670) * attempts * expo stop using spaces pls * attempt * you used to work without this sir * fixed * use serde instead of specta * remove `serde(default`) and update bindings * fix mobile * fix types --------- Co-authored-by: jake <77554505+brxken128@users.noreply.github.com> --- apps/mobile/modules/sd-core/ios/build-rust.sh | 5 +++-- apps/mobile/package.json | 16 ++++++++-------- .../components/modal/CreateLibraryModal.tsx | 2 +- .../mobile/src/screens/onboarding/context.tsx | 3 ++- core/src/api/libraries.rs | 17 +++++++++-------- .../settings/node/libraries/CreateDialog.tsx | 5 ++++- packages/client/src/core.ts | 2 +- pnpm-lock.yaml | Bin 794414 -> 790806 bytes 8 files changed, 28 insertions(+), 22 deletions(-) diff --git a/apps/mobile/modules/sd-core/ios/build-rust.sh b/apps/mobile/modules/sd-core/ios/build-rust.sh index ae697c85a..2a5ce24e1 100755 --- a/apps/mobile/modules/sd-core/ios/build-rust.sh +++ b/apps/mobile/modules/sd-core/ios/build-rust.sh @@ -25,10 +25,11 @@ if [ "${CONFIGURATION:-}" != "Debug" ]; then export CARGO_FLAGS fi +# Required for CI and for everyone I guess? +export PATH="${CARGO_HOME:-"${HOME}/.cargo"}/bin:$PATH" + # TODO: Also do this for non-Apple Silicon Macs if [ "${SPACEDRIVE_CI:-}" = "1" ]; then - # Required for CI - export PATH="${CARGO_HOME:-"${HOME}/.cargo"}/bin:$PATH" cargo build -p sd-mobile-ios --target x86_64-apple-ios diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 95bcd98ab..bd1e2565e 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -27,7 +27,7 @@ "@rspc/react": "=0.0.0-main-799eec5d", "@sd/assets": "workspace:*", "@sd/client": "workspace:*", - "@shopify/flash-list": "1.5.0", + "@shopify/flash-list": "1.4.3", "@tanstack/react-query": "^4.36.1", "class-variance-authority": "^0.7.0", "dayjs": "^1.11.10", @@ -36,23 +36,23 @@ "expo-build-properties": "~0.8.3", "expo-linking": "~5.0.2", "expo-media-library": "~15.4.1", - "expo-splash-screen": "~0.20.4", + "expo-splash-screen": "~0.20.5", "expo-status-bar": "~1.6.0", "intl": "^1.2.5", - "lottie-react-native": "6.2.0", + "lottie-react-native": "5.1.6", "moti": "^0.26.0", "phosphor-react-native": "^1.1.2", "react": "^18.2.0", "react-hook-form": "^7.47.0", - "react-native": "0.72.4", + "react-native": "0.72.5", "react-native-document-picker": "^9.0.1", "react-native-fs": "^2.20.0", "react-native-gesture-handler": "~2.12.1", "react-native-popup-menu": "^0.16.1", - "react-native-reanimated": "~3.4.2", - "react-native-safe-area-context": "4.7.1", - "react-native-screens": "~3.23.0", - "react-native-svg": "13.10.0", + "react-native-reanimated": "~3.3.0", + "react-native-safe-area-context": "4.6.3", + "react-native-screens": "~3.22.1", + "react-native-svg": "13.9.0", "react-native-wheel-color-picker": "^1.2.0", "twrnc": "^3.6.4", "use-count-up": "^3.0.1", diff --git a/apps/mobile/src/components/modal/CreateLibraryModal.tsx b/apps/mobile/src/components/modal/CreateLibraryModal.tsx index 10adb6209..7a2b25084 100644 --- a/apps/mobile/src/components/modal/CreateLibraryModal.tsx +++ b/apps/mobile/src/components/modal/CreateLibraryModal.tsx @@ -65,7 +65,7 @@ const CreateLibraryModal = forwardRef((_, ref) => { />