diff --git a/apps/admin-ui/app/(drawer)/_layout.tsx b/apps/admin-ui/app/(drawer)/_layout.tsx index a2ddf1e..4342615 100644 --- a/apps/admin-ui/app/(drawer)/_layout.tsx +++ b/apps/admin-ui/app/(drawer)/_layout.tsx @@ -1,5 +1,4 @@ -import { Drawer } from "expo-router/drawer"; -import { DrawerContentScrollView, DrawerItem } from "@react-navigation/drawer"; +import { Drawer, DrawerContentScrollView, DrawerItem } from "expo-router/drawer"; import { useRouter, Redirect } from "expo-router"; import { TouchableOpacity, @@ -76,91 +75,91 @@ function CustomDrawerContent() { label="Dashboard" onPress={() => router.dismissTo("/(drawer)/dashboard" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/products" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/prices-overview" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/product-groupings" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/dashboard-banners" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/slots" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/complaints" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/manage-orders" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/coupons" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/stores" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/user-management" as any)} icon={({ color, size }) => ( - + )} /> router.push("/(drawer)/dashboard/send-notifications" as any)} icon={({ color, size }) => ( - + )} /> logout()} icon={({ color, size }) => ( - + )} /> diff --git a/apps/admin-ui/app/(drawer)/dashboard/manage-orders/index.tsx b/apps/admin-ui/app/(drawer)/dashboard/manage-orders/index.tsx index a510489..84f9586 100644 --- a/apps/admin-ui/app/(drawer)/dashboard/manage-orders/index.tsx +++ b/apps/admin-ui/app/(drawer)/dashboard/manage-orders/index.tsx @@ -1,7 +1,7 @@ import { View, TouchableOpacity, Alert } from 'react-native'; import { MyText, BottomDropdown, tw, MyFlatList, useMarkDataFetchers } from 'common-ui'; -import { useRouter } from 'expo-router'; -import { useFocusEffect } from '@react-navigation/native'; +import { useRouter, useFocusEffect } from 'expo-router'; + import dayjs from 'dayjs'; import { useState, useCallback } from 'react'; import MaterialIcons from '@expo/vector-icons/MaterialIcons'; diff --git a/apps/admin-ui/app/_layout.tsx b/apps/admin-ui/app/_layout.tsx index f2d651e..d926e40 100644 --- a/apps/admin-ui/app/_layout.tsx +++ b/apps/admin-ui/app/_layout.tsx @@ -1,7 +1,12 @@ import { QueryClientProvider } from "@tanstack/react-query"; import queryClient from "../utils/queryClient"; import { Stack } from "expo-router"; +import { useFonts } from "expo-font"; +import * as SplashScreen from "expo-splash-screen"; +import { Provider as PaperProvider } from "react-native-paper"; +import { INTER_FONTS, PAPER_THEME } from "common-ui"; import { LogBox } from "react-native"; +import { useEffect } from "react"; import { StaffAuthProvider } from "@/components/context/staff-auth-context"; import { trpc, trpcClient } from "@/src/trpc-client"; import { SafeAreaView } from "react-native-safe-area-context"; @@ -17,21 +22,33 @@ if (__DEV__) { LogBox.ignoreAllLogs(true); } +SplashScreen.preventAutoHideAsync(); + export default function Layout() { + const [fontsLoaded, fontError] = useFonts(INTER_FONTS); + + useEffect(() => { + if (fontsLoaded || fontError) SplashScreen.hideAsync(); + }, [fontsLoaded, fontError]); + + if (!fontsLoaded && !fontError) return null; + return ( - - - - - + + + + + + + diff --git a/apps/user-ui/.easignore b/apps/user-ui/.easignore index 3635ab9..7f478a0 100644 --- a/apps/user-ui/.easignore +++ b/apps/user-ui/.easignore @@ -67,3 +67,27 @@ tests/ .env .env.* !.env.example + +# --- Local build artifacts: installers are never inputs to a build --- +# (two committed APKs alone were ~145 MB of the upload archive) +*.apk +*.aab +*.ipa +*.hbc +*.hbc.map + +# --- Local dev caches / tool state --- +.wrangler/ +**/.wrangler/ +.opencode/ +.maestro-output/ +.playwright-mcp/ +.commandcode/ +.agents/ +react-scan-reports/ +address_util/ + +# --- Local databases and SQL dumps --- +*.sqlite +*.sqlite3 +dumps/ diff --git a/apps/user-ui/app.json b/apps/user-ui/app.json index a0398d0..c1a11d7 100644 --- a/apps/user-ui/app.json +++ b/apps/user-ui/app.json @@ -121,7 +121,18 @@ } ], "expo-secure-store", - "expo-notifications" + "expo-notifications", + "expo-sharing", + "expo-sqlite", + "@react-native-community/datetimepicker", + "expo-video", + [ + "expo-camera", + { + "cameraPermission": "Freshyo uses the camera to scan offer QR codes and to attach photos to your reviews and complaints.", + "recordAudioAndroid": false + } + ] ], "experiments": { "typedRoutes": true diff --git a/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/(products)/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/(products)/index.tsx index 7515b1f..7f2c053 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/(products)/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/flash-delivery/(products)/index.tsx @@ -1,10 +1,10 @@ import React from 'react'; -import { useRouter } from 'expo-router'; +import { useRouter, useFocusEffect } from 'expo-router'; import { View, Alert } from 'react-native'; import { FlashDeliveryProducts } from '@/components/SlotSpecificView'; import FlashDeliveryNote from '@/components/FlashDeliveryNote'; import { useFlashNavigationStore } from '@/components/stores/flashNavigationStore'; -import { useFocusEffect } from '@react-navigation/native'; + import { useFlashCartStore } from '@/src/store/flashCartStore'; import { tw, BottomDialog, MyText, MyTouchableOpacity } from 'common-ui'; import MaterialIcons from '@expo/vector-icons/MaterialIcons'; diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/complaints/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/complaints/index.tsx index 611c4ba..86d3b6d 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/complaints/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/complaints/index.tsx @@ -2,7 +2,8 @@ import React from 'react'; import { View, Linking, TouchableOpacity, ActivityIndicator } from 'react-native'; import { Image } from 'expo-image'; import { MyText, tw, useManualRefresh, MyFlatList, useMarkDataFetchers, theme, MyTouchableOpacity } from 'common-ui'; -import { MaterialIcons, Ionicons } from '@expo/vector-icons'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; +import Ionicons from '@expo/vector-icons/Ionicons'; import { trpc } from '@/src/trpc-client'; import { useGetEssentialConsts } from '@/src/hooks/prominent-api-hooks'; import dayjs from 'dayjs'; diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/coupons/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/coupons/index.tsx index bd5cf3d..9311fc8 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/coupons/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/coupons/index.tsx @@ -1,8 +1,8 @@ import React, { useState, useCallback } from 'react'; import { View, ScrollView, Alert } from 'react-native'; import { AppContainer, MyText, tw, useMarkDataFetchers, MyTouchableOpacity, MyTextInput } from 'common-ui'; -import { useLocalSearchParams, useRouter } from 'expo-router'; -import { useFocusEffect } from '@react-navigation/native'; +import { useLocalSearchParams, useRouter, useFocusEffect } from 'expo-router'; + import { useAppStore } from '@/src/store/appStore'; import { trpc } from '@/src/trpc-client'; import MaterialIcons from '@expo/vector-icons/MaterialIcons'; diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/index.tsx index ef3713f..c4a4c18 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/index.tsx @@ -1,11 +1,11 @@ import React, { useState } from 'react'; import { View, ScrollView, Linking } from 'react-native'; -import { useRouter } from 'expo-router'; -import { useFocusEffect } from '@react-navigation/native'; +import { useRouter, useFocusEffect } from 'expo-router'; + import { AppContainer, MyText, tw, MyTouchableOpacity, ProfileImage, colors } from 'common-ui'; import TabLayoutWrapper from '@/components/TabLayoutWrapper'; import { LinearGradient } from 'expo-linear-gradient'; -import { Ionicons } from '@expo/vector-icons'; +import Ionicons from '@expo/vector-icons/Ionicons'; import NextOrderGlimpse from '@/components/NextOrderGlimpse'; import AddressSwitcherSheet from '@/src/components/location/AddressSwitcherSheet'; import { useRegion } from '@/src/hooks/useRegion'; diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx index 145744a..2e4b7d2 100755 --- a/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/my-orders/index.tsx @@ -1,7 +1,8 @@ import React, { useState, useCallback, useEffect } from 'react'; import { View, FlatList, Alert, ActivityIndicator } from 'react-native'; import { Image } from 'expo-image'; -import { MaterialIcons, Ionicons } from '@expo/vector-icons'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; +import Ionicons from '@expo/vector-icons/Ionicons'; import { useRouter } from 'expo-router'; import { tw, useManualRefresh, MyText, MyFlatList, useMarkDataFetchers, MyTouchableOpacity, theme } from 'common-ui'; diff --git a/apps/user-ui/app/(drawer)/(tabs)/me/terms/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/me/terms/index.tsx index a0c7244..247d02d 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/me/terms/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/me/terms/index.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { View, ScrollView } from 'react-native'; import { useRouter } from 'expo-router'; import { AppContainer, MyText, tw, MyTouchableOpacity } from 'common-ui'; -import { Ionicons } from '@expo/vector-icons'; +import Ionicons from '@expo/vector-icons/Ionicons'; import { TermsAndConditionsContent } from '@/components/TermsAndConditions'; export default function TermsAndConditions() { diff --git a/apps/user-ui/app/(drawer)/(tabs)/stores/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/stores/index.tsx index 4411218..f3bc54f 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/stores/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/stores/index.tsx @@ -15,7 +15,7 @@ import { MyTouchableOpacity, } from "common-ui"; import MaterialIcons from "@expo/vector-icons/MaterialIcons"; -import { Ionicons } from "@expo/vector-icons"; +import Ionicons from "@expo/vector-icons/Ionicons"; import { useStores } from "@/src/hooks/prominent-api-hooks"; import { LinearGradient } from "expo-linear-gradient"; import TabLayoutWrapper from "@/components/TabLayoutWrapper"; diff --git a/apps/user-ui/app/(drawer)/(tabs)/stores/store-detail/[id].tsx b/apps/user-ui/app/(drawer)/(tabs)/stores/store-detail/[id].tsx index 3adbdba..f52ea8d 100644 --- a/apps/user-ui/app/(drawer)/(tabs)/stores/store-detail/[id].tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/stores/store-detail/[id].tsx @@ -12,7 +12,6 @@ import { MyText, } from "common-ui"; import MaterialIcons from "@expo/vector-icons/MaterialIcons"; -import FontAwesome5 from "@expo/vector-icons/FontAwesome5"; import ProductCard from "@/components/ProductCard"; import FloatingCartBar from "@/components/floating-cart-bar"; import { useStoreHeaderStore } from "@/src/store/storeHeaderStore"; @@ -161,7 +160,7 @@ export default function StoreDetail() { - { Appearance.setColorScheme('light') }, []); - if (!loaded) { - return null; - } + React.useEffect(() => { + if (fontsLoaded || fontError) SplashScreen.hideAsync(); + }, [fontsLoaded, fontError]); + + if (!fontsLoaded && !fontError) return null; return ( @@ -80,7 +81,7 @@ export default function RootLayout() { - + diff --git a/apps/user-ui/assets/fonts/SpaceMono-Regular.ttf b/apps/user-ui/assets/fonts/SpaceMono-Regular.ttf deleted file mode 100755 index 28d7ff7..0000000 Binary files a/apps/user-ui/assets/fonts/SpaceMono-Regular.ttf and /dev/null differ diff --git a/apps/user-ui/assets/images/logo.png b/apps/user-ui/assets/images/logo.png deleted file mode 100644 index 4c13a45..0000000 Binary files a/apps/user-ui/assets/images/logo.png and /dev/null differ diff --git a/apps/user-ui/components/CheckoutAddressSelector.tsx b/apps/user-ui/components/CheckoutAddressSelector.tsx index b40fd87..45b5b6e 100644 --- a/apps/user-ui/components/CheckoutAddressSelector.tsx +++ b/apps/user-ui/components/CheckoutAddressSelector.tsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useRef } from 'react'; -import { View, Text, TouchableOpacity, ScrollView, Alert, NativeSyntheticEvent, NativeScrollEvent } from 'react-native'; +import { View, TouchableOpacity, ScrollView, Alert, NativeSyntheticEvent, NativeScrollEvent } from 'react-native'; import { useRouter } from 'expo-router'; import { tw, BottomDialog, RawBottomDialog, MyText } from 'common-ui'; import { useQueryClient } from '@tanstack/react-query'; @@ -176,21 +176,21 @@ const CheckoutAddressSelector: React.FC = ({ > - + Delivery Address - + setShowAddAddress(true)}> - + Add New + + Add New {(!sortedAddresses || sortedAddresses.length === 0) ? ( - No addresses found + No addresses found setShowAddAddress(true)} style={tw`mt-3 bg-brand500 px-4 py-2 rounded-lg`}> - Add Address + Add Address ) : ( @@ -221,9 +221,9 @@ const CheckoutAddressSelector: React.FC = ({ size={20} color={selectedAddress === address.id ? '#EC4899' : '#6B7280'} /> - + {address.name} - + {selectedAddress === address.id && ( @@ -231,15 +231,15 @@ const CheckoutAddressSelector: React.FC = ({ )} - + {address.addressLine1}{address.addressLine2 ? `, ${address.addressLine2}` : ''} - - + + {address.city}, {address.state} - - + + Phone: {address.phone} - + ))} @@ -274,9 +274,9 @@ const CheckoutAddressSelector: React.FC = ({ disabled={locationLoading && editingLocationAddressId === selectedAddr.id} style={tw`mt-2 py-2 px-3 bg-blue-50 rounded-lg self-start`} > - + {locationLoading && editingLocationAddressId === selectedAddr.id ? 'Attaching...' : '+ Attach Current Location'} - + ) : null; diff --git a/apps/user-ui/components/ComplaintForm.tsx b/apps/user-ui/components/ComplaintForm.tsx index 6c1ed1d..07825fb 100644 --- a/apps/user-ui/components/ComplaintForm.tsx +++ b/apps/user-ui/components/ComplaintForm.tsx @@ -1,7 +1,6 @@ import React, { useState } from 'react'; import { View, TextInput, ActivityIndicator, Alert } from 'react-native'; -import { MaterialIcons } from '@expo/vector-icons' -import { MyText, ImageUploaderNeo, tw, MyTouchableOpacity, type ImageUploaderNeoItem, type ImageUploaderNeoPayload } from 'common-ui' +import MaterialIcons from '@expo/vector-icons/MaterialIcons';import { MyText, ImageUploaderNeo, tw, MyTouchableOpacity, type ImageUploaderNeoItem, type ImageUploaderNeoPayload } from 'common-ui' import { trpc } from '@/src/trpc-client' import { useUploadToObjectStorage } from '../hooks/useUploadToObjectStore' import type { ComplaintFormProps } from '@packages/shared' diff --git a/apps/user-ui/components/NextOrderGlimpse.tsx b/apps/user-ui/components/NextOrderGlimpse.tsx index 4fc9a44..34d2feb 100644 --- a/apps/user-ui/components/NextOrderGlimpse.tsx +++ b/apps/user-ui/components/NextOrderGlimpse.tsx @@ -5,7 +5,7 @@ import { View, TouchableOpacity, ActivityIndicator, Linking, ScrollView, Dimensi import { useRouter } from 'expo-router'; import { tw, MyText } from 'common-ui'; import { useNavigationTarget } from 'common-ui/hooks/useNavigationTarget'; -import { MaterialIcons } from '@expo/vector-icons'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; import dayjs from 'dayjs'; import { trpc } from '@/src/trpc-client'; import { orderStatusManipulator } from '@/src/lib/string-manipulators'; diff --git a/apps/user-ui/components/OrderMenu.tsx b/apps/user-ui/components/OrderMenu.tsx index 7233497..6257179 100644 --- a/apps/user-ui/components/OrderMenu.tsx +++ b/apps/user-ui/components/OrderMenu.tsx @@ -1,6 +1,7 @@ import React, { useState } from 'react'; import { View, Alert, TextInput, ActivityIndicator } from 'react-native'; -import { MaterialIcons, Ionicons } from '@expo/vector-icons'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; +import Ionicons from '@expo/vector-icons/Ionicons'; import { tw, MyText, MyTouchableOpacity, BottomDialog } from 'common-ui'; import { trpc } from '@/src/trpc-client'; import ComplaintForm from '@/components/ComplaintForm'; diff --git a/apps/user-ui/components/PaymentAndOrderComponent.tsx b/apps/user-ui/components/PaymentAndOrderComponent.tsx index efe1375..cba3baf 100644 --- a/apps/user-ui/components/PaymentAndOrderComponent.tsx +++ b/apps/user-ui/components/PaymentAndOrderComponent.tsx @@ -10,7 +10,6 @@ import { useRegion } from '@/src/hooks/useRegion'; import { useCheckoutStore } from '@/src/store/checkoutStore'; import { clearLocalCart } from '@/hooks/cart-query-hooks'; import { useQueryClient } from '@tanstack/react-query'; -import { FontAwesome5, FontAwesome6 } from '@expo/vector-icons'; interface PaymentAndOrderProps { selectedAddress: number | null; @@ -216,7 +215,7 @@ const PaymentAndOrderComponent: React.FC = ({ - + Cash on Delivery @@ -226,11 +225,11 @@ const PaymentAndOrderComponent: React.FC = ({ - + UPI accepted during COD - + Cash payment diff --git a/apps/user-ui/components/ProductDetail.tsx b/apps/user-ui/components/ProductDetail.tsx index b7d3bb9..1592b1f 100644 --- a/apps/user-ui/components/ProductDetail.tsx +++ b/apps/user-ui/components/ProductDetail.tsx @@ -8,7 +8,6 @@ import usePickImage from 'common-ui/src/components/use-pick-image'; import { theme } from 'common-ui/src/theme'; import dayjs from 'dayjs'; import MaterialIcons from '@expo/vector-icons/MaterialIcons'; -import FontAwesome5 from '@expo/vector-icons/FontAwesome5'; import { trpc, trpcClient } from '@/src/trpc-client'; import { useAddToCart, useGetCart, useUpdateCartItem, useRemoveFromCart } from '@/hooks/cart-query-hooks'; import { useProductSlotIdentifier } from '@/hooks/useProductSlotIdentifier'; @@ -528,7 +527,7 @@ const ProductDetail: React.FC = ({ productId, isFlashDeliver {productDetail.store && ( - + Sourced From diff --git a/apps/user-ui/hooks/useAuthenticatedRoute.ts b/apps/user-ui/hooks/useAuthenticatedRoute.ts index 41194b2..6d1806e 100644 --- a/apps/user-ui/hooks/useAuthenticatedRoute.ts +++ b/apps/user-ui/hooks/useAuthenticatedRoute.ts @@ -1,6 +1,6 @@ -import { useFocusEffect } from '@react-navigation/native'; + import type { AuthRedirectOptions } from '@packages/shared' -import { useRouter } from 'expo-router'; +import { useRouter, useFocusEffect } from 'expo-router'; import { useAuth } from '@/src/contexts/AuthContext'; import type { RedirectState } from '@/src/contexts/AuthContext'; import { StorageServiceCasual } from 'common-ui'; diff --git a/apps/user-ui/metro.config.js b/apps/user-ui/metro.config.js index b110521..cd5ebee 100755 --- a/apps/user-ui/metro.config.js +++ b/apps/user-ui/metro.config.js @@ -30,4 +30,19 @@ config.resolver.blockList = [ new RegExp(`^${escapeForRegExp(path.resolve(__dirname, 'tests'))}[/\\\\].*$`), ]; +// expo-router's public entry requires `withLayoutContext` -> NativeTabTrigger +// -> optional-libraries/expo-symbols, which does `require('expo-symbols')` at +// module scope. That drags @expo-google-fonts/material-symbols (976 KB) into +// every bundle for a native-tabs feature this app never uses. Nothing imports +// expo-symbols directly, so resolve it to an empty module. +const upstreamResolveRequest = config.resolver.resolveRequest; +config.resolver.resolveRequest = (context, moduleName, platform) => { + if (moduleName === 'expo-symbols') { + return { type: 'empty' }; + } + return upstreamResolveRequest + ? upstreamResolveRequest(context, moduleName, platform) + : context.resolveRequest(context, moduleName, platform); +}; + module.exports = config; diff --git a/apps/user-ui/package.json b/apps/user-ui/package.json index 94451be..fb81121 100644 --- a/apps/user-ui/package.json +++ b/apps/user-ui/package.json @@ -16,32 +16,48 @@ "dependencies": { "@expo/vector-icons": "^15.0.2", "@react-native-async-storage/async-storage": "2.2.0", + "@react-native-community/datetimepicker": "9.2.1", + "@react-native-community/netinfo": "12.0.1", + "@react-native-community/slider": "5.2.1", "@react-navigation/drawer": "^7.3.9", "@react-navigation/native": "^7.1.6", + "@shopify/flash-list": "2.3.2", "@tanstack/react-query": "^5.100.0", "@trpc/client": "^11.6.0", "@trpc/react-query": "^11.6.0", "axios": "^1.11.0", "dayjs": "^1.11.18", "expo": "~58.0.26", + "expo-application": "~58.1.2", "expo-blur": "~58.0.6", + "expo-camera": "~58.0.14", + "expo-clipboard": "~58.0.4", "expo-constants": "~58.0.16", "expo-crypto": "~58.0.8", "expo-device": "~58.0.5", "expo-document-picker": "~58.0.5", "expo-font": "~58.0.12", + "expo-haptics": "~58.0.8", "expo-image": "~58.0.18", "expo-image-picker": "~58.0.10", "expo-linear-gradient": "~58.0.4", "expo-linking": "~58.0.17", "expo-location": "~58.0.22", "expo-notifications": "~58.1.9", + "expo-print": "~58.0.9", "expo-router": "~58.0.32", + "expo-screen-capture": "~58.0.6", + "expo-screen-orientation": "~58.0.4", "expo-secure-store": "~58.0.3", + "expo-sharing": "~58.0.23", "expo-splash-screen": "~58.0.14", + "expo-sqlite": "~58.0.18", "expo-status-bar": "~58.0.5", + "expo-store-review": "~58.0.3", + "expo-symbols": "~58.0.5", "expo-system-ui": "~58.0.7", "expo-updates": "~58.0.22", + "expo-video": "~58.0.14", "expo-web-browser": "~58.1.0", "formik": "^2.4.6", "fuse.js": "^7.1.0", @@ -51,13 +67,16 @@ "react-hook-form": "^7.62.0", "react-native": "0.88.1", "react-native-gesture-handler": "~3.3.0", + "react-native-keyboard-controller": "1.22.7", "react-native-maps": "1.29.11", + "react-native-pager-view": "9.0.7", "react-native-paper": "^5.14.5", "react-native-reanimated": "4.7.1", "react-native-safe-area-context": "~5.11.1", "react-native-screens": "~4.30.1", "react-native-svg": "15.16.0", "react-native-toast-message": "^2.3.3", + "react-native-view-shot": "6.1.1", "react-native-web": "~0.21.4", "react-native-webview": "14.0.1", "react-native-worklets": "0.13.0", diff --git a/apps/user-ui/src/hooks/useHideTabNav.ts b/apps/user-ui/src/hooks/useHideTabNav.ts index bef02b2..5ddc936 100644 --- a/apps/user-ui/src/hooks/useHideTabNav.ts +++ b/apps/user-ui/src/hooks/useHideTabNav.ts @@ -1,5 +1,5 @@ import * as React from 'react'; -import { useFocusEffect } from '@react-navigation/native'; +import { useFocusEffect } from 'expo-router'; import { useAppStore } from '@/src/store/appStore'; export const useHideTabNav = (caller: string = 'default') => { diff --git a/bun.lock b/bun.lock index d290321..6270432 100644 --- a/bun.lock +++ b/bun.lock @@ -198,32 +198,48 @@ "dependencies": { "@expo/vector-icons": "^15.0.2", "@react-native-async-storage/async-storage": "2.2.0", + "@react-native-community/datetimepicker": "9.2.1", + "@react-native-community/netinfo": "12.0.1", + "@react-native-community/slider": "5.2.1", "@react-navigation/drawer": "^7.3.9", "@react-navigation/native": "^7.1.6", + "@shopify/flash-list": "2.3.2", "@tanstack/react-query": "^5.100.0", "@trpc/client": "^11.6.0", "@trpc/react-query": "^11.6.0", "axios": "^1.11.0", "dayjs": "^1.11.18", "expo": "~58.0.26", + "expo-application": "~58.1.2", "expo-blur": "~58.0.6", + "expo-camera": "~58.0.14", + "expo-clipboard": "~58.0.4", "expo-constants": "~58.0.16", "expo-crypto": "~58.0.8", "expo-device": "~58.0.5", "expo-document-picker": "~58.0.5", "expo-font": "~58.0.12", + "expo-haptics": "~58.0.8", "expo-image": "~58.0.18", "expo-image-picker": "~58.0.10", "expo-linear-gradient": "~58.0.4", "expo-linking": "~58.0.17", "expo-location": "~58.0.22", "expo-notifications": "~58.1.9", + "expo-print": "~58.0.9", "expo-router": "~58.0.32", + "expo-screen-capture": "~58.0.6", + "expo-screen-orientation": "~58.0.4", "expo-secure-store": "~58.0.3", + "expo-sharing": "~58.0.23", "expo-splash-screen": "~58.0.14", + "expo-sqlite": "~58.0.18", "expo-status-bar": "~58.0.5", + "expo-store-review": "~58.0.3", + "expo-symbols": "~58.0.5", "expo-system-ui": "~58.0.7", "expo-updates": "~58.0.22", + "expo-video": "~58.0.14", "expo-web-browser": "~58.1.0", "formik": "^2.4.6", "fuse.js": "^7.1.0", @@ -233,13 +249,16 @@ "react-hook-form": "^7.62.0", "react-native": "0.88.1", "react-native-gesture-handler": "~3.3.0", + "react-native-keyboard-controller": "1.22.7", "react-native-maps": "1.29.11", + "react-native-pager-view": "9.0.7", "react-native-paper": "^5.14.5", "react-native-reanimated": "4.7.1", "react-native-safe-area-context": "~5.11.1", "react-native-screens": "~4.30.1", "react-native-svg": "15.16.0", "react-native-toast-message": "^2.3.3", + "react-native-view-shot": "6.1.1", "react-native-web": "~0.21.4", "react-native-webview": "14.0.1", "react-native-worklets": "0.13.0", @@ -316,6 +335,7 @@ "name": "common-ui", "version": "1.0.0", "dependencies": { + "@expo-google-fonts/inter": "^0.4.2", "@expo/vector-icons": "^15.0.2", "@react-native-community/datetimepicker": "9.2.1", "@react-navigation/drawer": "^7.5.8", @@ -683,6 +703,10 @@ "@eslint/plugin-kit": ["@eslint/plugin-kit@0.4.1", "", { "dependencies": { "@eslint/core": "^0.17.0", "levn": "^0.4.1" } }, "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA=="], + "@expo-google-fonts/inter": ["@expo-google-fonts/inter@0.4.2", "", {}, "sha512-syfiImMaDmq7cFi0of+waE2M4uSCyd16zgyWxdPOY7fN2VBmSLKEzkfbZgeOjJq61kSqPBNNtXjggiQiSD6gMQ=="], + + "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.54", "", {}, "sha512-BcwBgi5EX5sA3sCzwPFM9Cp2squg3ugfw+e3OKBvWkZs9bEDkO0QiTeX8AlezS032vyAryikwEOqeJXVs5hNgQ=="], + "@expo/cli": ["@expo/cli@58.1.21", "", { "dependencies": { "2g": "^1.0.1", "@expo/code-signing-certificates": "^0.0.7", "@expo/config": "~58.0.12", "@expo/config-plugins": "~58.0.13", "@expo/devcert": "^1.2.2", "@expo/env": "~2.6.0", "@expo/image-utils": "^0.12.7", "@expo/inline-modules": "^0.2.10", "@expo/json-file": "^11.2.1", "@expo/log-box": "^58.0.15", "@expo/log-box-utils": "^58.0.2", "@expo/metro": "~58.0.0", "@expo/metro-config": "58.0.23", "@expo/metro-file-map": "^58.0.6", "@expo/osascript": "^2.8.1", "@expo/package-manager": "^1.14.2", "@expo/platforms": "^58.0.1", "@expo/plist": "^0.10.2", "@expo/prebuild-config": "^58.0.20", "@expo/require-utils": "^58.0.6", "@expo/router-server": "^58.0.23", "@expo/schema-utils": "^58.0.3", "@expo/spawn-async": "^1.8.0", "@expo/ws-tunnel": "^2.0.1", "@expo/xcpretty": "^4.4.6", "@react-native/asset-utils": "0.88.1", "@react-native/dev-middleware": "0.88.1", "@react-native/js-polyfills": "0.88.1", "accepts": "^1.3.8", "agent-cli-detector": "0.1.7", "arg": "^5.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "dnssd-advertise": "^1.1.6", "expo-server": "^58.1.0", "fetch-nodeshim": "^0.4.10", "lan-network": "^0.2.1", "multitars": "^1.0.2", "node-forge": "^1.4.0", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.4", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "sandbox-cli-detector": "^0.2.0", "semver": "^7.7.4", "send": "^0.19.0", "slugify": "^1.3.4", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "tinyglobby": "^0.2.15", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1" }, "peerDependencies": { "expo": "*", "expo-mcp": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-mcp", "expo-router", "react-native"], "bin": { "expo-internal": "bin/cli.js" } }, "sha512-E+27FQ1Y26fVb0p1wVHBFkbe5oQubUXLwF/au5Vy8OCqDWrmbekBQamRI4mBhY15FhZQxAkyK0e6hXcEFKVBOw=="], "@expo/code-signing-certificates": ["@expo/code-signing-certificates@0.0.7", "", { "dependencies": { "node-forge": "^1.4.0" } }, "sha512-zP0tnfqrFFRL8INtOaQ6XwEYfdIpIH9vrEo7y0bHQGQa50z4/QWXE5CI4nRUHxqFW4MVWOwXFg1hom1aAZHNkQ=="], @@ -1019,6 +1043,10 @@ "@react-native-community/datetimepicker": ["@react-native-community/datetimepicker@9.2.1", "", { "dependencies": { "invariant": "^2.2.4" }, "peerDependencies": { "expo": ">=52.0.0", "react": "*", "react-native": "*", "react-native-windows": "*" }, "optionalPeers": ["expo", "react-native-windows"] }, "sha512-P2dir8EcPYuS6g7N/E4jImugB99h2+e1kzNX6Ihg+2T2v5IZ5dB+4afLisG6rdua4YZ1mADYCZ2iqI34sPjIKA=="], + "@react-native-community/netinfo": ["@react-native-community/netinfo@12.0.1", "", { "peerDependencies": { "react": "*", "react-native": ">=0.59" } }, "sha512-P/3caXIvfYSJG8AWJVefukg+ZGRPs+M4Lp3pNJtgcTYoJxCjWrKQGNnCkj/Cz//zWa/avGed0i/wzm0T8vV2IQ=="], + + "@react-native-community/slider": ["@react-native-community/slider@5.2.1", "", {}, "sha512-HBDPRFRIN47hRtd5tdDWZp3kkVN1z98jGbK9wHOfUfVO+PbBDZzD7xjiiyBqNpg6Rom2QPFOpBZzsB2bHy4yAQ=="], + "@react-native-masked-view/masked-view": ["@react-native-masked-view/masked-view@0.3.2", "", { "peerDependencies": { "react": ">=16", "react-native": ">=0.57" } }, "sha512-XwuQoW7/GEgWRMovOQtX3A4PrXhyaZm0lVUiY8qJDvdngjLms9Cpdck6SmGAUNqQwcj2EadHC1HwL0bEyoa/SQ=="], "@react-native/asset-utils": ["@react-native/asset-utils@0.88.1", "", {}, "sha512-BLb5FF7NgggGYiCsA7KKkK2qFhn0K+6iGXOI+4Ucd+G7Robzw9Gt4WsWwxLt+Od+G+/hyqfz8ASokyWFZ6VcLw=="], @@ -1119,6 +1147,8 @@ "@rtsao/scc": ["@rtsao/scc@1.1.0", "", {}, "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g=="], + "@shopify/flash-list": ["@shopify/flash-list@2.3.2", "", { "peerDependencies": { "@babel/runtime": "*", "react": "*", "react-native": "*" } }, "sha512-vQnd0y0Ag11yzS30llaeCrtIU3xYTMe7KEOP3dveLImnVjQEUw6BEg1+Ztja6aODlVNz1BpvxtlQ5eZGxiLwKw=="], + "@sinclair/typebox": ["@sinclair/typebox@0.27.10", "", {}, "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA=="], "@sindresorhus/is": ["@sindresorhus/is@7.2.0", "", {}, "sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw=="], @@ -1219,6 +1249,8 @@ "@types/draco3d": ["@types/draco3d@1.4.10", "", {}, "sha512-AX22jp8Y7wwaBgAixaSvkoG4M/+PlAcm3Qs4OW8yT9DM4xUpWKeFhLueTAyZF39pviAdcDdeJoACapiAceqNcw=="], + "@types/emscripten": ["@types/emscripten@1.41.6", "", {}, "sha512-uN+9i8bFT5CUcZfyIEYDrSueACEyKGbUs5kC/72DGlZZoinh84sJfVV0i8UOJD1asdzkvLPBRrKs41kZ8MdEXg=="], + "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], "@types/geojson": ["@types/geojson@7946.0.16", "", {}, "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg=="], @@ -1427,6 +1459,8 @@ "available-typed-arrays": ["available-typed-arrays@1.0.7", "", { "dependencies": { "possible-typed-array-names": "^1.0.0" } }, "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ=="], + "await-lock": ["await-lock@2.2.2", "", {}, "sha512-aDczADvlvTGajTDjcjpJMqRkOF6Qdz3YbPZm/PyW6tKPkx2hlYBzxMhEywM/tU72HrVZjgl5VCdRuMlA7pZ8Gw=="], + "aws4fetch": ["aws4fetch@1.0.20", "", {}, "sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g=="], "axios": ["axios@1.16.0", "", { "dependencies": { "follow-redirects": "^1.16.0", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w=="], @@ -1465,6 +1499,8 @@ "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="], + "barcode-detector": ["barcode-detector@3.2.4", "", { "dependencies": { "zxing-wasm": "3.1.7" } }, "sha512-4tjallFXSratRbkzyccnfgL8w/3FtTexjWpQoPes3niFQ2DybGeaktH8w5ukc6wVUrOL7yNsoUUqmaRVn1YtJg=="], + "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="], "baseline-browser-mapping": ["baseline-browser-mapping@2.10.8", "", { "bin": { "baseline-browser-mapping": "dist/cli.cjs" } }, "sha512-PCLz/LXGBsNTErbtB6i5u4eLpHeMfi93aUv5duMmj6caNu6IphS4q6UevDnL36sZQv9lrP11dbPKGMaXPwMKfQ=="], @@ -1825,6 +1861,10 @@ "expo-blur": ["expo-blur@58.0.6", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-gjcw+pBi/15Qy9L0vD6n+KbEbutz6owvrjbYr+74kSaNgj0DEf2qJ7cEU3EJ8/f8KcZss0/7sUWWO9FtBEg+Wg=="], + "expo-camera": ["expo-camera@58.0.14", "", { "dependencies": { "barcode-detector": "^3.0.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-yEiMuJ2d7A+EqsP8rlGIvgaUzdk/rW9CXR6R7WKqludxU3H+JcSUbPC3ldr3ZpmaYlgXP3x+oOO9BfQy7yKK2A=="], + + "expo-clipboard": ["expo-clipboard@58.0.4", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-b2eEJMwdWXLTrmrkg/otsmL2OV6s9D90tytSNBsY87UswrWf6JwxcB2OaWegyUWD9XnvtBVNeVK7lej0zZh+5A=="], + "expo-constants": ["expo-constants@58.0.16", "", { "dependencies": { "@expo/env": "~2.6.0", "@expo/require-utils": "^58.0.6" }, "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-sVETnE1ktBMclc2Ve3qNrHhOCCio75a9JdghnJYGbqblmKfrrfE+lO9K4g9kNtmslIBLTK9Dyty6PbubkXs3Yw=="], "expo-crypto": ["expo-crypto@58.0.8", "", { "peerDependencies": { "expo": "*" } }, "sha512-yMSiMlallOweQ28oQ3BqJf6I/4ZoBggFNRg+PfjG1NbQWBWzGKmkPPUrd3yT0oPW4P+AYppg+Mw6xoAYddLUKA=="], @@ -1849,6 +1889,8 @@ "expo-glass-effect": ["expo-glass-effect@58.0.5", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-PkL1X/r0cTs6NG47Xp3TxRvtqSeRmPYhPOHp3GDmZB2oOxpjXge6qLi/bSSv0asFWqf+MLOlXZ+hq2Imuh0Z1g=="], + "expo-haptics": ["expo-haptics@58.0.8", "", { "peerDependencies": { "expo": "*" } }, "sha512-hxW9LoJQhAJ4hRlGx0DZ10ncs2NFqC/0nfKSnGy1PcpH6e8dJ4/oJO9eOcAG/vFg8k5oonbZkWL7RK9G3729Tg=="], + "expo-image": ["expo-image@58.0.18", "", { "dependencies": { "sf-symbols-typescript": "^2.2.0" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-bWbFD8eBbZywr1WssV6KtcglRlpD5WpzVj+oA3hfjX1MJBN43IeB7A6EQAGXE0eGBVG93Mf2dRBmCRJ/e/Hw6g=="], "expo-image-loader": ["expo-image-loader@58.0.3", "", { "peerDependencies": { "expo": "*" } }, "sha512-zlHudxC8OObyqCHmvdxJqURI7886KJ0cUJyn7R/a8FOD9fP837xKDN+u4SIt7XsSSVPNXzMd4Y7mN0pmup8NGA=="], @@ -1879,26 +1921,42 @@ "expo-notifications": ["expo-notifications@58.1.9", "", { "dependencies": { "@expo/image-utils": "^0.12.7", "abort-controller": "^3.0.0", "badgin": "^1.1.5", "expo-application": "~58.1.2", "expo-constants": "~58.0.16" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-Zhixn1+3hdd+XqwAwnNqggePs+/fcwERoBxrxTaJjfEMA0N9Q4RPm2iIsBuzKxrccRBJz0BMF2QULQXoA5yGtw=="], + "expo-print": ["expo-print@58.0.9", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-LkjyzbbpTd9oaxZOIx7pIiZtPRZgp1FOG1B1akTs0i+2HfT5UNyVFNKgsfQKa/7Xo+Ec9+Pr73SLwRbYEtBL9Q=="], + "expo-router": ["expo-router@58.0.32", "", { "dependencies": { "@expo/log-box": "^58.0.15", "@expo/metro-runtime": "^58.0.17", "@expo/schema-utils": "^58.0.3", "@radix-ui/react-slot": "^1.2.0", "@radix-ui/react-tabs": "^1.1.12", "@react-native-masked-view/masked-view": "^0.3.2", "@react-native/normalize-colors": "0.88.1", "client-only": "^0.0.1", "expo-glass-effect": "^58.0.5", "expo-server": "^58.1.0", "expo-status-bar": "^58.0.5", "nanoid": "^3.3.18", "react-fast-compare": "^3.2.2", "react-is": "^19.1.0", "react-native-drawer-layout": "^4.2.12", "react-native-screens": "^4.30.1 || ^5.0.0-beta.1", "server-only": "^0.0.1", "sf-symbols-typescript": "^2.1.0", "standard-navigation": "^0.0.5" }, "peerDependencies": { "@expo/ui": "^58.0.29", "@testing-library/react-native": ">= 14.0.0", "expo": "*", "expo-constants": "^58.0.16", "expo-linking": "^58.0.17", "expo-symbols": "^58.0.5", "react": "*", "react-dom": "*", "react-native": "*", "react-native-gesture-handler": "*", "react-native-reanimated": "*", "react-native-safe-area-context": ">= 5.4.0", "react-native-web": "*", "react-native-worklets": "*", "react-server-dom-webpack": "~19.0.4 || ~19.1.5 || ~19.2.4 || ~19.3.0" }, "optionalPeers": ["@expo/ui", "@testing-library/react-native", "expo-symbols", "react-dom", "react-native-gesture-handler", "react-native-reanimated", "react-native-web", "react-native-worklets", "react-server-dom-webpack"] }, "sha512-UEfbsGvjGL8MJXj/NHt/elUupdJ5tUDvaHdSy0fEfIIeUnOqixr6KJZlyv9OrJyl4OYmWt8HuCHDyT5Pzqbfkw=="], + "expo-screen-capture": ["expo-screen-capture@58.0.6", "", { "peerDependencies": { "expo": "*", "react": "*" } }, "sha512-mJLGEyoP0TiQjxL/+x0pmvx9/QXVzGa4vywVLeH2InEPUTGsqWm5AYW6fQghauch5RmafkMr6oyoxy8RZu/zoA=="], + + "expo-screen-orientation": ["expo-screen-orientation@58.0.4", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-PN3nGluAC6vBY7Zs9jA9guZrKth7ynVHZjZNJZhrJrV7X+6rlvpr7LzktTNJveb2HZJUU94FySkKGrWePkkE2A=="], + "expo-secure-store": ["expo-secure-store@58.0.3", "", { "peerDependencies": { "expo": "*" } }, "sha512-RpubZfqJREEcwKbx3HFoWbtDd31t+yESMj7Ei5/mGQp5vViwUBzL4nUCZRLFyt+O690mT8We7dDtIUZeIk6LbQ=="], "expo-server": ["expo-server@58.1.0", "", {}, "sha512-jo7I6uHnP5OQYKx3+7lbpdVVnOEwFj2ryDkQdauUQSwgh2HuMUkiFXWUIVe01ts6DLRoff5U0Tv+uNb3CMq/kw=="], "expo-server-sdk": ["expo-server-sdk@5.0.0", "", { "dependencies": { "promise-limit": "^2.7.0", "promise-retry": "^2.0.1", "undici": "^7.2.0" } }, "sha512-GEp1XYLU80iS/hdRo3c2n092E8TgTXcHSuw6Lw68dSoWaAgiLPI2R+e5hp5+hGF1TtJZOi2nxtJX63+XA3iz9g=="], + "expo-sharing": ["expo-sharing@58.0.23", "", { "dependencies": { "@expo/config-plugins": "^58.0.13", "@expo/config-types": "^58.0.3", "@expo/plist": "^0.10.2" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-TRu/CM7s4caW0TcVurO49468jtHAraoRVa4et5lHWKd18/5tfFMOA3ZAxsEezBaI8ehcLXhWc9FPBSxtYY6GYQ=="], + "expo-splash-screen": ["expo-splash-screen@58.0.14", "", { "dependencies": { "@expo/config-plugins": "~58.0.13", "@expo/image-utils": "^0.12.7", "xml2js": "0.6.0" }, "peerDependencies": { "expo": "*" } }, "sha512-Z05ihk8LoBX3GeUd1EiV8yG9hd1Pw9wa5AaiAFQx4c81laMVo0LX6x+0o5fXFKnBA9VjlMe5CYWQqUtZf3BCIw=="], + "expo-sqlite": ["expo-sqlite@58.0.18", "", { "dependencies": { "await-lock": "^2.2.2" }, "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-EbRG/tb4Q+M28sZUY+58TSRrj/bK3RBOoGG8xXeobOJnMuBCMhstoKZlTJpu79ydzqURO5TXdbVhqk9suh39rQ=="], + "expo-status-bar": ["expo-status-bar@58.0.5", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-Lq1h7QpNY2FY7+Dyrn15atrFZs1Yd4IfMfhwyyWb3TqWc+vwtYZH54W9VhhjqXtgitXe+RVAX7YZoCekjbLmug=="], + "expo-store-review": ["expo-store-review@58.0.3", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-gyWrg9nFL0N6Jl+FOj5Q0TJT17X6BkkIep3zQLRG/PHxqAul0vY3KCOXqIYBigCUg94hSFzQbvbaFP5Yhkq9Hg=="], + "expo-structured-headers": ["expo-structured-headers@58.0.1", "", {}, "sha512-wIduvAIUdGQk82osLjFiYYq3TFHUdG4RgmN+C//EySxn/2PTu0RsJsdgBtXrp/OT3YGeesNgfzb1mFxq5Zhp0g=="], + "expo-symbols": ["expo-symbols@58.0.5", "", { "dependencies": { "@expo-google-fonts/material-symbols": "^0.4.1", "sf-symbols-typescript": "^2.0.0" }, "peerDependencies": { "expo": "*", "expo-font": "*", "react": "*", "react-native": "*" } }, "sha512-6YKmDsd44hVcTBvhf0wsbqmwefDsVwYinY4fOKAISVGDSETSrOj0uroPyODxZjGX00Ms2z8XXgor1ElueNJNNw=="], + "expo-system-ui": ["expo-system-ui@58.0.7", "", { "dependencies": { "@react-native/normalize-colors": "0.88.1", "debug": "^4.3.2" }, "peerDependencies": { "expo": "*", "react-native": "*", "react-native-web": "*" }, "optionalPeers": ["react-native-web"] }, "sha512-XxrMY93bT8MpZUlc6uRKzkeUoXhBi/Eq8j3qx2pjk0ARCV+0Ed1eqzmgxuAoKZ+10cyOZVSke5Hhi78NVFReuQ=="], "expo-updates": ["expo-updates@58.0.22", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.7", "@expo/env": "^2.6.0", "@expo/plist": "^0.10.2", "@expo/spawn-async": "^1.8.0", "@react-native/asset-utils": "0.88.1", "arg": "^4.1.0", "chalk": "^4.1.2", "debug": "^4.3.4", "expo-eas-client": "~58.0.2", "expo-manifests": "~58.0.1", "expo-structured-headers": "~58.0.1", "expo-updates-interface": "~58.0.1", "ignore": "^5.3.1", "nullthrows": "^1.1.1", "resolve-from": "^5.0.0" }, "peerDependencies": { "expo": "*", "expo-dev-client": "*", "react": "*", "react-native": "*" }, "optionalPeers": ["expo-dev-client"], "bin": { "expo-updates": "bin/cli.js" } }, "sha512-ceGlQ+C1fKX+cOEd4tg+/IP0YNdPrRYBScLUoNaV5f9ABEUypsWNTfruFDkBeKv1YdbDLdGahyXhDk2B8Fa+Zg=="], "expo-updates-interface": ["expo-updates-interface@58.0.1", "", { "peerDependencies": { "expo": "*" } }, "sha512-OF+3BtMXtUsXWDfpHVNus9yHpx7WjMwjxDfeeN9LQBYSq/UtYmNNHBSfzChYTuqljWFSOAHRfsDykV9EB73Wlg=="], + "expo-video": ["expo-video@58.0.14", "", { "peerDependencies": { "expo": "*", "react": "*", "react-native": "*" } }, "sha512-PYB85kvyvTN8E40TUOgHTI+nucp9O2aFYf4IULZUE71l0iW+YmXIAcp+ZwsLuMSYtdt5QRPqdpdvbyXWeEZLPw=="], + "expo-web-browser": ["expo-web-browser@58.1.0", "", { "peerDependencies": { "expo": "*", "react-native": "*" } }, "sha512-WNMMTyrXkKQt6Id7u4GnwrWO8UFw/cVl7oSUUwyo1X14lKdc7uE+1poW9VCuXzOog7QOjmQytBclWdeDW75K1A=="], "exponential-backoff": ["exponential-backoff@3.1.3", "", {}, "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA=="], @@ -2739,6 +2797,8 @@ "react-native-keyboard-aware-scroll-view": ["react-native-keyboard-aware-scroll-view@0.9.5", "", { "dependencies": { "prop-types": "^15.6.2", "react-native-iphone-x-helper": "^1.0.3" }, "peerDependencies": { "react-native": ">=0.48.4" } }, "sha512-XwfRn+T/qBH9WjTWIBiJD2hPWg0yJvtaEw6RtPCa5/PYHabzBaWxYBOl0usXN/368BL1XktnZPh8C2lmTpOREA=="], + "react-native-keyboard-controller": ["react-native-keyboard-controller@1.22.7", "", { "dependencies": { "react-native-is-edge-to-edge": "^1.2.1" }, "peerDependencies": { "react": "*", "react-native": "*", "react-native-reanimated": ">=3.0.0" } }, "sha512-IBR9z6Nl/iDLRfiv1zN9QQroOXAwYMugeAjVDb+CFbRBNC8fayXlHTBbshVcWc4j95Itsv+1/FgwfxKnIn1Vmg=="], + "react-native-maps": ["react-native-maps@1.29.11", "", { "dependencies": { "@types/geojson": "^7946.0.13" }, "peerDependencies": { "react": ">= 18.3.1", "react-native": ">= 0.76.0", "react-native-web": ">= 0.11" }, "optionalPeers": ["react-native-web"] }, "sha512-fZNc6AINuPdHS2puudanNPd9ZMPPuerTHfy9HU6LbpOD+kB03SuOZRbOEYIOE2eSuUPYwLHvU8ys1RcSIxLYhA=="], "react-native-pager-view": ["react-native-pager-view@9.0.7", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-71kLSrjZy8onJTXkoAWF/0UtInkF+xqmqudiV/axZe8PVGG+CK6jVdh8NYFJLKetQ6UQ9ScPNliagpvLBp1xkQ=="], @@ -2759,6 +2819,8 @@ "react-native-toast-message": ["react-native-toast-message@2.3.3", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-4IIUHwUPvKHu4gjD0Vj2aGQzqPATiblL1ey8tOqsxOWRPGGu52iIbL8M/mCz4uyqecvPdIcMY38AfwRuUADfQQ=="], + "react-native-view-shot": ["react-native-view-shot@6.1.1", "", { "peerDependencies": { "html2canvas-pro": "^2.0.0", "react": ">=18.0.0", "react-native": ">=0.80.0" }, "optionalPeers": ["html2canvas-pro", "react-native"] }, "sha512-eMoNXNgADlcMT5mbquHqueE55bUuJA6vpUj650ZiresuorgdRrhDCfaxI2QGL6TN1UT+76EgQMjDO6Vx/H0ZLA=="], + "react-native-web": ["react-native-web@0.21.4", "", { "dependencies": { "@babel/runtime": "^7.18.6", "@react-native/normalize-colors": "^0.74.1", "fbjs": "^3.0.4", "inline-style-prefixer": "^7.0.1", "memoize-one": "^6.0.0", "nullthrows": "^1.1.1", "postcss-value-parser": "^4.2.0", "styleq": "^0.1.3" }, "peerDependencies": { "react": "^18.0.0 || ^19.0.0", "react-dom": "^18.0.0 || ^19.0.0" } }, "sha512-77B6KlalB4osNIck91TNFixPkYPsTbuNEvw8P7IV+4v4/5wZSBRKZnw0Zhx6YjuauDTz71gc8IW+fVhcBMjr5A=="], "react-native-webview": ["react-native-webview@14.0.1", "", { "dependencies": { "escape-string-regexp": "^4.0.0", "invariant": "2.2.4" }, "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-lBUuvFk459Mo+5vUNqwzGvn+I8rDJE6zvOulG2hWWudeEOJfWTsQwOfuYnRu+27djUIXrESFfC+EQE3PGu+FWA=="], @@ -3003,6 +3065,8 @@ "synckit": ["synckit@0.11.13", "", { "dependencies": { "@pkgr/core": "^0.3.6" } }, "sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg=="], + "tagged-tag": ["tagged-tag@1.0.0", "", {}, "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng=="], + "tailwind-merge": ["tailwind-merge@2.6.1", "", {}, "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ=="], "tailwindcss": ["tailwindcss@3.4.19", "", { "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.6.0", "didyoumean": "^1.2.2", "dlv": "^1.1.3", "fast-glob": "^3.3.2", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", "jiti": "^1.21.7", "lilconfig": "^3.1.3", "micromatch": "^4.0.8", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.1.1", "postcss": "^8.4.47", "postcss-import": "^15.1.0", "postcss-js": "^4.0.1", "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0", "postcss-nested": "^6.2.0", "postcss-selector-parser": "^6.1.2", "resolve": "^1.22.8", "sucrase": "^3.35.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" } }, "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ=="], @@ -3277,6 +3341,8 @@ "zustand": ["zustand@5.0.12", "", { "peerDependencies": { "@types/react": ">=18.0.0", "immer": ">=9.0.6", "react": ">=18.0.0", "use-sync-external-store": ">=1.2.0" }, "optionalPeers": ["@types/react", "immer", "react", "use-sync-external-store"] }, "sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g=="], + "zxing-wasm": ["zxing-wasm@3.1.7", "", { "dependencies": { "@types/emscripten": "^1.41.6", "type-fest": "^5.10.0" } }, "sha512-LI94ndlOY+xoqlkNcc0EwByrMpUXKrCX171EQ38kGWqpiRq/gcnC+ZrbRipvxI3uV4LaDtNlKo1p9Uayg1sesQ=="], + "@asamuzakjp/css-color/lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="], "@babel/helper-annotate-as-pure/@babel/types": ["@babel/types@7.29.0", "", { "dependencies": { "@babel/helper-string-parser": "^7.27.1", "@babel/helper-validator-identifier": "^7.28.5" } }, "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A=="], @@ -4025,6 +4091,8 @@ "youch/cookie": ["cookie@1.1.1", "", {}, "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ=="], + "zxing-wasm/type-fest": ["type-fest@5.10.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-NoSdpq/WEiAg5sjmBkmV/hfxv6HJH4NqPNrqjtSO5CwRmpsDfaf4begxW34KdJykH/l1yHtwBWQkCRdoXO8mPA=="], + "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], "@babel/helper-annotate-as-pure/@babel/types/@babel/helper-validator-identifier": ["@babel/helper-validator-identifier@7.28.5", "", {}, "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q=="], diff --git a/change-log.txt b/change-log.txt index f1902f1..40e75d7 100644 --- a/change-log.txt +++ b/change-log.txt @@ -1765,3 +1765,201 @@ build its own runtimeVersion so OTA traffic cannot cross SDK lines. --- apps/user-ui/app.json - "version": "1.2.0" + "version": "1.3.0" + +[2026-11-18 11:50:10 IST] user-ui: add react-native-pager-view (dependency only). + +Native paging primitive behind the home tag tabs (Android ViewPager2 / iOS +UIPageViewController). Expo SDK 58 pins 9.0.7, installed exact to match +`bundledNativeModules`. No imports, screens or store changes - the package is +declared only so the next native build links it; the later JS wiring can then +ship as an OTA update on that build's runtimeVersion. + +--- apps/user-ui/package.json (dependencies) ++ "react-native-pager-view": "9.0.7" + +[2026-11-18 12:05:00 IST] user-ui: preinstall the future native surface (list A). + +Everything is declared now so the next build links it and later JS-only work can +ship by OTA. No imports anywhere yet. + +--- apps/user-ui/package.json (dependencies, SDK 58 pins) ++ @react-native-community/netinfo, expo-clipboard, expo-haptics, ++ @react-native-community/slider, react-native-keyboard-controller, ++ expo-sharing, react-native-view-shot, expo-print, expo-sqlite, ++ expo-camera, expo-local-authentication, expo-media-library, expo-contacts, ++ expo-tracking-transparency, @react-native-community/datetimepicker, ++ @shopify/flash-list, expo-audio, expo-video, expo-symbols, ++ expo-screen-orientation, expo-application, expo-store-review, ++ expo-screen-capture +--- apps/user-ui/app.json (plugins) ++ expo-camera (camera + microphone usage strings, recordAudioAndroid off) ++ expo-local-authentication (Face ID usage string) ++ expo-media-library (photo library + save permission strings) ++ expo-contacts (contacts usage string) ++ expo-tracking-transparency (ATT usage string) ++ expo-audio (microphone usage string for future voice notes) + +[2026-11-18 12:59:42 IST] user-ui: drop 5 of the preinstalled native modules. + +Keeping the list A set minus the permission-heavy ones: expo-contacts, +expo-local-authentication, expo-audio, expo-tracking-transparency and +expo-media-library are removed again (package + app.json plugin), so the build +carries no mic / contacts / photo-library / ATT / biometrics permissions. + +--- apps/user-ui/package.json (dependencies) +- expo-contacts, expo-local-authentication, expo-audio, expo-tracking-transparency, + expo-media-library +--- apps/user-ui/app.json (plugins) +- expo-audio, expo-tracking-transparency, expo-media-library, expo-contacts, + expo-local-authentication +~ expo-camera: microphonePermission removed; recordAudioAndroid stays false + (the plugin defaults it to true, which would add RECORD_AUDIO) + +[2026-11-18 13:12:00 IST] user-ui + common-ui: per-set icon imports, drop MaterialCommunityIcons. + +`from '@expo/vector-icons'` re-exports every icon family, so Metro bundled all +18 TTFs (3.93 MB) and their glyphmaps no matter which icon was used. Every barrel +import is now the per-set path (`@expo/vector-icons/MaterialIcons`), and the +checkbox moved from MaterialCommunityIcons (1.28 MB font + 216 KB glyphmap) to +MaterialIcons glyphs, so the user app only ships MaterialIcons, Ionicons and +FontAwesome5. + +--- apps/user-ui/** + packages/ui/** (19 files) +- import { A, B } from '@expo/vector-icons' ++ import A from '@expo/vector-icons/A' ++ import B from '@expo/vector-icons/B' +--- packages/ui/src/components/checkbox.tsx +- MaterialCommunityIcons: checkbox-marked / checkbox-blank-outline / + checkbox-marked-circle / checkbox-blank-circle-outline ++ MaterialIcons: check-box / check-box-outline-blank / check-circle / + radio-button-unchecked + +[2026-11-18 13:26:40 IST] user-ui: drop the remaining unused fonts/icons + dead assets. + +--- apps/user-ui/components/PaymentAndOrderComponent.tsx + FontAwesome5 (rupee-sign, money-bill-wave) -> MaterialIcons (currency-rupee, payments) +--- apps/user-ui/components/ProductDetail.tsx, stores/store-detail/[id].tsx + FontAwesome5 store -> MaterialIcons store + (FontAwesome5 pulled Solid+Regular+Brands = 371 KB for three icons) +--- apps/user-ui/app/_layout.tsx + removed useFonts + the `if (!loaded) return null` gate: only loaded SpaceMono, + which no style ever used +--- deleted + assets/fonts/SpaceMono-Regular.ttf (93 KB, unused) + assets/images/logo.png (520 KB, unreferenced; + assets/logo.png is the used one) + +measured with `expo export --platform android`: + icon fonts 3.93 MB -> 2.05 MB (18 families -> MaterialIcons + Ionicons + Paper's MCI) + bundle assets total -> 3.1 MB, hbc 7.0 MB + +[2026-11-18 13:33:10 IST] user-ui: stop bundling expo-symbols / Material Symbols font (976 KB). + +expo-router's public entry eagerly requires `withLayoutContext`, which requires +`native-tabs/NativeTabTrigger`, which reaches `optional-libraries/expo-symbols` +- and that file does `require('expo-symbols')` at module scope inside a +try/catch. Result: every app importing anything from 'expo-router' bundles +@expo-google-fonts/material-symbols (976 KB) for a feature we never use +(native tabs `md` icons). Swapping expo-router/tabs for +@react-navigation/bottom-tabs would not have helped - the chain starts at +'expo-router' itself. + +--- apps/user-ui/metro.config.js ++ resolver.resolveRequest: `expo-symbols` -> { type: 'empty' } + (nothing in the app imports it; only NativeTabs' `md` icon path would, and + that now fails with a TypeError instead of a helpful message) + +[2026-11-18 13:41:20 IST] common-ui: remove the Nunito font family entirely. + +MyText mapped every `weight` to a `Nunito-*` family that was never shipped or +loaded, so RN silently fell back to the system font on every render - the map +was dead config. The family strings (and the dead `fontFamily` variable) are +gone; `weight` now only sets `fontWeight`, which is exactly what rendered +before, and leaves the door open for Inter later. + +--- packages/ui/src/components/text.tsx +- Nunito-Light / Nunito-Regular / Nunito-Medium / Nunito-SemiBold / Nunito-Bold ++ FONT_WEIGHTS map: light 300, regular 400, medium 500, semibold 600, bold 700 + (applies to user-ui and admin-ui, which share this component) + +[2026-11-18 13:25:49 IST] user-ui + admin-ui: Inter as the app font. + +Replaces the dead Nunito map with real Inter files. The family map lives in +common-ui so both apps resolve the same six weights; each app loads them with +expo-font and keeps its splash up until they are ready. + +--- packages/ui/package.json ++ @expo-google-fonts/inter +--- packages/ui/src/lib/fonts.ts (new) + INTER_FONTS (400/500/600/700/800/900) + interFamilyFor(weight) +--- packages/ui/index.ts ++ export INTER_FONTS, interFamilyFor +--- packages/ui/src/components/text.tsx + weight prop + the tw fontWeight in `style` both resolve to an Inter family; + fontWeight is dropped from the applied style so Android uses the real file +--- apps/user-ui/app/_layout.tsx, apps/admin-ui/app/_layout.tsx + useFonts(INTER_FONTS) + SplashScreen.preventAutoHideAsync/hideAsync gate + PaperProvider theme fonts mapped per variant weight +--- raw -> MyText + apps/user-ui/components/CheckoutAddressSelector.tsx + packages/ui/{quantifier,mini-quantifier,bottom-dropdown,date-time-picker}.tsx + +[2026-11-18 13:38:40 IST] user-ui + admin-ui: Inter weights loaded via subpaths (size fix). + +Importing '@expo-google-fonts/inter' from its root pulls every weight *and* +italic (18 TTFs, ~6 MB) because the package index re-exports them all and Metro +cannot tree-shake asset requires. Each weight is now imported from its own +subpath, so exactly the six used files ship (2.06 MB). + +measured: export assets 2.2 MB -> 4.2 MB (fonts +2.06 MB), hbc unchanged ~7 MB + +[2026-11-18 14:04:42 IST] user-ui + admin-ui: navigation hooks come from expo-router. + +Blanking screen after the SDK 58 build: "Couldn't find a navigation object. Is +your component inside NavigationContainer?" thrown while rendering Dashboard. +expo-router 58 vendors React Navigation, so `useFocusEffect` imported from the +standalone @react-navigation/native reads a different context than the one the +router provides. Dashboard calls useMarkDataFetchers() -> useFocusEffect, so it +threw on first render and the screen stayed blank. + +--- apps/user-ui/{app/_layout.tsx, app/(drawer)/(tabs)/me/index.tsx, + app/(drawer)/(tabs)/me/coupons/index.tsx, + app/(drawer)/(tabs)/flash-delivery/(products)/index.tsx, + hooks/useAuthenticatedRoute.ts, src/hooks/useHideTabNav.ts} +--- packages/ui/hooks/{useFocusCallback,useMarkDataFetchers,useDrawerTitle}.ts +--- apps/admin-ui/app/(drawer)/dashboard/manage-orders/index.tsx +- import { useFocusEffect } from '@react-navigation/native' ++ import { useFocusEffect } from 'expo-router' + (ThemeProvider/DarkTheme/DefaultTheme in the user-ui root layout likewise) +--- apps/admin-ui/app/(drawer)/_layout.tsx +- DrawerContentScrollView, DrawerItem from '@react-navigation/drawer' ++ from 'expo-router/drawer' (and `color as string` for the 13 DrawerItem icons, + the vendored item types color as ColorValue) + +verified: tsc 0 in both apps, expo export builds the android bundle. +NOT updated: tests still jest.mock('@react-navigation/native'); those mocks need +to point at expo-router when the suites are next touched. + +[2026-11-18 14:45:40 IST] .easignore: stop uploading local artifacts and caches. + +The 151 MB project archive was mostly files no build reads: two APKs in the +repo (92 MB + 53 MB), Cloudflare .wrangler state (~46 MB), .opencode tooling +(18 MB), backend SQL dumps (18 MB) and .maestro-output (9 MB). All excluded now. + +--- apps/user-ui/.easignore ++ *.apk, *.aab, *.ipa, *.hbc, *.hbc.map ++ .wrangler/ (any level), .opencode/, .maestro-output/, .playwright-mcp/, + .commandcode/, .agents/, react-scan-reports/, address_util/ ++ *.sqlite, *.sqlite3, apps/backend/dumps/ + +[2026-11-18 16:40 IST] App Store screenshots captured from both iOS simulators. + +New files only (no source changed): +- apps/user-ui/store-screenshots/iphone-6.9-inch/ (1320x2868, iPhone 16 Pro Max) +- apps/user-ui/store-screenshots/iphone-6.5-inch/ (1242x2688, iPhone 6.5") + +Screens: 01-home, 02-one-hour-delivery, 03-stores, 04-my-account +(+ 05-product in the 6.9" set; App Store Connect scales the 6.9" set down). + +Status bar was overridden to 9:41 / full wifi / charged for both devices +(xcrun simctl status_bar override --time 9:41 ...). diff --git a/packages/ui/hooks/useDrawerTitle.ts b/packages/ui/hooks/useDrawerTitle.ts index 49443fa..d358d81 100644 --- a/packages/ui/hooks/useDrawerTitle.ts +++ b/packages/ui/hooks/useDrawerTitle.ts @@ -1,6 +1,6 @@ import { DependencyList, useEffect } from 'react'; import { DeviceEventEmitter } from 'react-native'; -import { useFocusEffect } from '@react-navigation/native'; +import { useFocusEffect } from 'expo-router'; export function useDrawerTitle(title: string, deps: DependencyList) { useFocusEffect(() => { diff --git a/packages/ui/hooks/useFocusCallback.ts b/packages/ui/hooks/useFocusCallback.ts index 3e3dd6f..cba03ce 100644 --- a/packages/ui/hooks/useFocusCallback.ts +++ b/packages/ui/hooks/useFocusCallback.ts @@ -1,4 +1,4 @@ -import { useFocusEffect } from '@react-navigation/native'; +import { useFocusEffect } from 'expo-router'; import { useCallback } from 'react'; /** diff --git a/packages/ui/hooks/useMarkDataFetchers.ts b/packages/ui/hooks/useMarkDataFetchers.ts index ff9c6d6..9205619 100644 --- a/packages/ui/hooks/useMarkDataFetchers.ts +++ b/packages/ui/hooks/useMarkDataFetchers.ts @@ -1,5 +1,5 @@ import { useCallback, useRef } from 'react'; -import { useFocusEffect } from '@react-navigation/native'; +import { useFocusEffect } from 'expo-router'; export const useMarkDataFetchers = (callback: () => void) => { // The callback is held in a ref: call sites pass inline arrows, so putting it in the diff --git a/packages/ui/index.ts b/packages/ui/index.ts index 21942a3..c0bc391 100755 --- a/packages/ui/index.ts +++ b/packages/ui/index.ts @@ -35,6 +35,8 @@ import { RefreshProvider, useRefresh } from "./src/lib/refresh-context"; import MyStatusBar from "./src/components/MyStatusBar"; import { InfoDialog } from "./src/components/info-dialog"; import { updateStatusBarColor, useStatusBarStore } from "./src/lib/status-bar-store"; +import { INTER_FONTS, interFamilyFor, InterFamily } from "./src/lib/fonts"; +import { PAPER_THEME } from "./src/lib/paper-theme"; const isDevMode = Constants.executionEnvironment !== "standalone"; @@ -80,4 +82,8 @@ export { InfoDialog, updateStatusBarColor, useStatusBarStore, + INTER_FONTS, + interFamilyFor, + InterFamily, + PAPER_THEME, }; diff --git a/packages/ui/package.json b/packages/ui/package.json index 7504535..5b1859a 100755 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -4,6 +4,7 @@ "main": "index.ts", "private": true, "dependencies": { + "@expo-google-fonts/inter": "^0.4.2", "@expo/vector-icons": "^15.0.2", "@react-native-community/datetimepicker": "9.2.1", "@react-navigation/drawer": "^7.5.8", diff --git a/packages/ui/src/components/ImageUploader.tsx b/packages/ui/src/components/ImageUploader.tsx index 97c82ec..080b3c5 100755 --- a/packages/ui/src/components/ImageUploader.tsx +++ b/packages/ui/src/components/ImageUploader.tsx @@ -5,7 +5,7 @@ import type { ImageUploaderProps } from '@packages/shared'; import MyText from "./text"; import tw from '../lib/tailwind'; import Ionicons from "@expo/vector-icons/Ionicons"; -import { MaterialIcons } from "@expo/vector-icons"; +import MaterialIcons from "@expo/vector-icons/MaterialIcons"; const ImageUploader: React.FC = ({ images, diff --git a/packages/ui/src/components/ImageUploaderNeo.tsx b/packages/ui/src/components/ImageUploaderNeo.tsx index 312f9e4..478b084 100644 --- a/packages/ui/src/components/ImageUploaderNeo.tsx +++ b/packages/ui/src/components/ImageUploaderNeo.tsx @@ -2,8 +2,7 @@ import React from 'react' import { View } from 'react-native' import { Image } from 'expo-image' import Ionicons from '@expo/vector-icons/Ionicons' -import { MaterialIcons } from '@expo/vector-icons' -import type { ImageUploaderNeoItem, ImageUploaderNeoPayload, ImageUploaderNeoProps } from '@packages/shared' +import MaterialIcons from '@expo/vector-icons/MaterialIcons';import type { ImageUploaderNeoItem, ImageUploaderNeoPayload, ImageUploaderNeoProps } from '@packages/shared' import tw from '../lib/tailwind' import MyText from './text' import MyTouchableOpacity from './touchable-opacity' diff --git a/packages/ui/src/components/bottom-dropdown.tsx b/packages/ui/src/components/bottom-dropdown.tsx index eae00e1..61233e3 100644 --- a/packages/ui/src/components/bottom-dropdown.tsx +++ b/packages/ui/src/components/bottom-dropdown.tsx @@ -1,6 +1,6 @@ import React, { useState, useCallback, useRef, useEffect } from 'react'; -import { Text, View, TouchableOpacity, ScrollView, TextInput, Dimensions } from 'react-native'; -import { Ionicons } from '@expo/vector-icons'; +import { View, TouchableOpacity, ScrollView, TextInput, Dimensions } from 'react-native'; +import Ionicons from '@expo/vector-icons/Ionicons'; import { BottomDialog } from './dialog'; import MyText from './text'; import { useTheme } from '../../hooks/theme-context'; @@ -193,7 +193,7 @@ const BottomDropdown: React.FC = ({ onPress={() => !disabled && setIsOpen(true)} disabled={disabled} > - 0 : options.some(opt => opt.value === value)) @@ -204,7 +204,7 @@ const BottomDropdown: React.FC = ({ numberOfLines={1} > {getDisplayText()} - + = ({ } }}> - {label} + {label} {/* Search Input - Fixed at top */} {onSearch && ( @@ -250,9 +250,9 @@ const BottomDropdown: React.FC = ({ > {filteredOptions.length === 0 && searchQuery ? ( - + No options found for "{searchQuery}" - + ) : ( filteredOptions.map((option) => { @@ -274,27 +274,27 @@ const BottomDropdown: React.FC = ({ disabled={isDisabled} > - - {code} + {code} {rest ? ` - ${rest}` : ''} {option.disabled && option.note ? ( - Disabled + Disabled ) : null} - + {!!option.note && ( - {option.note} - + )} {selected && ( @@ -319,9 +319,9 @@ const BottomDropdown: React.FC = ({ color={colors.brand500} style={tw`mr-1`} /> - + {option.detail.label} - + {isDetailOpen && ( @@ -352,7 +352,7 @@ const BottomDropdown: React.FC = ({ style={[tw`px-4 py-2 rounded-md flex-1 mr-2`, { backgroundColor: colors.brand500 }]} onPress={handleDone} > - Done + Done )} diff --git a/packages/ui/src/components/checkbox.tsx b/packages/ui/src/components/checkbox.tsx index 1253144..7888e37 100755 --- a/packages/ui/src/components/checkbox.tsx +++ b/packages/ui/src/components/checkbox.tsx @@ -1,5 +1,5 @@ import { useTheme } from "common-ui"; -import { MaterialCommunityIcons } from '@expo/vector-icons'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; import React from 'react'; import { Platform, TouchableOpacity, ViewStyle } from 'react-native'; // import { useTheme } from '../hooks/theme-context'; @@ -31,9 +31,11 @@ const Checkbox: React.FC = ({ const { colors } = useTheme().theme; const fill = fillColor || colors.brand500; const check = checkColor || colors.white1; + // MaterialIcons glyphs: filled box/circle with the tick knocked out, same + // visual as the MaterialCommunityIcons set this used to require (1.3 MB). const iconName = Platform.OS === 'android' - ? checked ? 'checkbox-marked' : 'checkbox-blank-outline' - : checked ? 'checkbox-marked-circle' : 'checkbox-blank-circle-outline'; + ? checked ? 'check-box' : 'check-box-outline-blank' + : checked ? 'check-circle' : 'radio-button-unchecked'; return ( = ({ accessibilityRole="checkbox" accessibilityState={{ checked, disabled }} > - {showLabels && Select Time} - + {value?.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", }) || "Select Time"} - + {showLabels && Select Date} - {value?.toLocaleDateString() || "Select Date"} + {value?.toLocaleDateString() || "Select Date"} {showLabels && Select Time} - + {value?.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", }) || "Select Time"} - + setShow(false)} style={tw`mt-2.5 bg-blue-500 rounded py-2.5 items-center`} > - Done + Done diff --git a/packages/ui/src/components/image-viewer.tsx b/packages/ui/src/components/image-viewer.tsx index 09988d2..29bf956 100755 --- a/packages/ui/src/components/image-viewer.tsx +++ b/packages/ui/src/components/image-viewer.tsx @@ -9,7 +9,7 @@ import { ActivityIndicator, Platform, } from "react-native"; -import { Ionicons } from "@expo/vector-icons"; +import Ionicons from "@expo/vector-icons/Ionicons"; interface ImageViewerProps { uri: string; diff --git a/packages/ui/src/components/mini-quantifier.tsx b/packages/ui/src/components/mini-quantifier.tsx index 442d9b7..ad36b03 100644 --- a/packages/ui/src/components/mini-quantifier.tsx +++ b/packages/ui/src/components/mini-quantifier.tsx @@ -1,7 +1,8 @@ import React from 'react'; -import { View, TouchableOpacity, Text } from 'react-native'; -import { MaterialIcons } from '@expo/vector-icons'; +import { View, TouchableOpacity } from 'react-native'; +import MaterialIcons from '@expo/vector-icons/MaterialIcons'; import tw from '../lib/tailwind'; +import MyText from './text'; import CartIcon from './icons/CartIcon'; interface MiniQuantifierProps { @@ -23,9 +24,9 @@ const MiniQuantifier: React.FC = ({ value, onChange, showUn - {value} + {value} {showUnits && unit && ( - {unit} + {unit} )} = ({ @@ -30,14 +31,14 @@ const Quantifier: React.FC = ({ - + {value} - + {/* {unitText && ( //hide unit text for now - + {unitText} - + )} */} diff --git a/packages/ui/src/components/text.tsx b/packages/ui/src/components/text.tsx index f737458..0a931d7 100755 --- a/packages/ui/src/components/text.tsx +++ b/packages/ui/src/components/text.tsx @@ -1,6 +1,8 @@ import React from 'react'; import { Text as PaperText } from 'react-native-paper'; import { TextProps as RNTextProps } from 'react-native'; +import { StyleSheet } from 'react-native'; +import { interFamilyFor } from '../lib/fonts'; import { useTheme } from "common-ui"; import type { Theme } from "common-ui"; // import { useTheme } from '../hooks/theme-context'; @@ -11,6 +13,15 @@ type ThemeColor = keyof Theme['colors']; type FontWeight = 'light' | 'regular' | 'medium' | 'semibold' | 'bold'; +/** MyText's `weight` prop -> a flexbox font weight. */ +const WEIGHT_PROP: Record = { + light: '300', + regular: '400', + medium: '500', + semibold: '600', + bold: '700', +}; + interface Props extends RNTextProps { children: React.ReactNode; color?: ThemeColor; @@ -20,40 +31,26 @@ interface Props extends RNTextProps { function MyText({ style, children, color, weight = 'regular', ...rest }: Props) { const { colors } = useTheme().theme; - // Map weight to fontFamily and fontWeight - let fontFamily = 'Nunito-Regular'; - let fontWeight: any = undefined; - switch (weight) { - case 'light': - fontFamily = 'Nunito-Light'; - fontWeight = '300'; - break; - case 'regular': - fontFamily = 'Nunito-Regular'; - fontWeight = '400'; - break; - case 'medium': - fontFamily = 'Nunito-Medium'; - fontWeight = '500'; - break; - case 'semibold': - fontFamily = 'Nunito-SemiBold'; - fontWeight = '600'; - break; - case 'bold': - fontFamily = 'Nunito-Bold'; - fontWeight = '700'; - break; - } - let textColor: string | undefined; if (color && colors[color]) textColor = colors[color]; + + // The family is picked from whichever weight wins: the `weight` prop or a + // tw class (`font-bold`) in `style`. The weight itself is removed from the + // applied style - on Android a custom family plus fontWeight falls back to + // synthesised/system bold instead of the Inter file we loaded. + const flat = StyleSheet.flatten(style) || {}; + const { fontWeight: styleWeight, ...styleWithoutWeight } = flat as { + fontWeight?: string | number; + [key: string]: unknown; + }; + const fontFamily = interFamilyFor(styleWeight ?? WEIGHT_PROP[weight]); + return ( diff --git a/packages/ui/src/lib/fonts.ts b/packages/ui/src/lib/fonts.ts new file mode 100644 index 0000000..c16c6fe --- /dev/null +++ b/packages/ui/src/lib/fonts.ts @@ -0,0 +1,49 @@ +/** + * The app font: Inter, one static file per weight. + * + * React Native cannot pick a weight out of a single family on Android, so every + * weight is loaded as its own family (`Inter_700Bold`, not `Inter` + 700) and + * `interFamilyFor()` maps a CSS-ish weight to the matching file. Shared by + * user-ui and admin-ui so both apps resolve the same names. + */ +// Import each weight from its own subpath. The package's root index re-exports +// every weight (and italics), and Metro has no tree-shaking for CJS asset +// requires - the root import bundled all 18 TTFs (~6 MB) instead of 6. +import { Inter_400Regular } from '@expo-google-fonts/inter/400Regular' +import { Inter_500Medium } from '@expo-google-fonts/inter/500Medium' +import { Inter_600SemiBold } from '@expo-google-fonts/inter/600SemiBold' +import { Inter_700Bold } from '@expo-google-fonts/inter/700Bold' +import { Inter_800ExtraBold } from '@expo-google-fonts/inter/800ExtraBold' +import { Inter_900Black } from '@expo-google-fonts/inter/900Black' + +/** Pass straight to `useFonts()` from expo-font. */ +export const INTER_FONTS = { + Inter_400Regular, + Inter_500Medium, + Inter_600SemiBold, + Inter_700Bold, + Inter_800ExtraBold, + Inter_900Black, +} + +export type InterFamily = keyof typeof INTER_FONTS + +const BY_WEIGHT: Record = { + '100': 'Inter_400Regular', + '200': 'Inter_400Regular', + '300': 'Inter_400Regular', + 'normal': 'Inter_400Regular', + '400': 'Inter_400Regular', + '500': 'Inter_500Medium', + '600': 'Inter_600SemiBold', + 'bold': 'Inter_700Bold', + '700': 'Inter_700Bold', + '800': 'Inter_800ExtraBold', + '900': 'Inter_900Black', +} + +/** Map a flexbox font weight (RN `fontWeight` or MyText's `weight` prop) to a loaded family. */ +export function interFamilyFor(weight?: string | number | null): InterFamily { + if (weight == null) return 'Inter_400Regular' + return BY_WEIGHT[String(weight)] ?? 'Inter_400Regular' +} diff --git a/packages/ui/src/lib/paper-theme.ts b/packages/ui/src/lib/paper-theme.ts new file mode 100644 index 0000000..d49185c --- /dev/null +++ b/packages/ui/src/lib/paper-theme.ts @@ -0,0 +1,22 @@ +/** + * react-native-paper theme whose typography points at the Inter families loaded + * by `INTER_FONTS`. Paper's own components (Button labels, TextInput, dialogs) + * do not go through MyText, so without this they would stay on the system font. + */ +import { configureFonts, DefaultTheme } from 'react-native-paper' + +import { interFamilyFor } from './fonts' + +const base = configureFonts({ config: { fontFamily: 'Inter_400Regular' } }) + +const fonts = Object.fromEntries( + Object.entries(base).map(([variant, type]) => { + const { fontWeight } = type as { fontWeight?: string | number } + return [variant, { ...(type as object), fontFamily: interFamilyFor(fontWeight) }] + }) +) as typeof base + +export const PAPER_THEME = { + ...DefaultTheme, + fonts, +}