Merge pull request #2080 from The-Commit-Company/develop

nikkothari22 · web-flow · commit b3b67e45e2c5 · 2026-03-18T13:29:10.000+05:30
Merging develop into main
diff --git a/apps/mobile/app.json b/apps/mobile/app.json
@@ -8,11 +8,6 @@
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "automatic",
     "newArchEnabled": true,
-    "splash": {
-      "image": "./assets/splash.png",
-      "resizeMode": "contain",
-      "backgroundColor": "#000000"
-    },
     "ios": {
       "supportsTablet": false,
       "appleTeamId": "W6346TTZQX",
@@ -47,6 +42,19 @@
       [
         "expo-router"
       ],
+      [
+        "expo-splash-screen",
+        {
+          "backgroundColor": "#ffffff",
+          "image": "./assets/splash.png",
+          "imageWidth": 400,
+          "resizeMode": "contain",
+          "dark": {
+            "backgroundColor": "#121212",
+            "image": "./assets/splash.png"
+          }
+        }
+      ],
       [
         "expo-secure-store"
       ],
@@ -87,4 +95,4 @@
     },
     "owner": "the-commit-company"
   }
-}
+}
diff --git a/apps/mobile/app/_layout.tsx b/apps/mobile/app/_layout.tsx
@@ -1,8 +1,8 @@
 import 'expo-dev-client';
-import { router, Slot, usePathname } from 'expo-router';
+import { router, Slot } from 'expo-router';
 import { ThemeProvider } from '@react-navigation/native';
 import "../global.css";
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
 import { setNavigationBar, themeAtom } from '@hooks/useColorScheme';
@@ -23,6 +23,9 @@ import advancedFormat from 'dayjs/plugin/advancedFormat'
 import relativeTime from 'dayjs/plugin/relativeTime';
 import { useAtom } from 'jotai';
 import { useColorScheme } from 'nativewind';
+import * as SplashScreen from 'expo-splash-screen';
+import * as SystemUI from 'expo-system-ui';
+import { Appearance } from 'react-native';
 
 dayjs.extend(utc)
 dayjs.extend(timezone)
@@ -40,46 +43,77 @@ if (__DEV__) {
     ]);
 }
 
+// Prevent splash from auto-hiding before app is ready
+SplashScreen.preventAutoHideAsync()
+
+SplashScreen.setOptions({
+    duration: 200,
+    fade: true,
+});
+
 const messaging = getMessaging()
 
 export default function RootLayout() {
 
-    // const path = usePathname()
-    // console.log(path)
 
-    const { getItem } = useAsyncStorage(`default-site`)
+    const [appIsReady, setAppIsReady] = useState(false);
+    const { getItem } = useAsyncStorage(`default-site`);
+    const { colorScheme, setColorScheme } = useColorScheme();
+    const isDarkColorScheme = colorScheme === 'dark';
+    const [theme] = useAtom(themeAtom);
+
+    // Set system UI background color early to prevent flash
+    useEffect(() => {
+        const setSystemBackground = async () => {
+            const scheme = Appearance.getColorScheme();
+            const bgColor = scheme === 'dark' ? '#121212' : '#ffffff';
+            await SystemUI.setBackgroundColorAsync(bgColor);
+        };
+        setSystemBackground();
+    }, []);
 
 
     useEffect(() => {
 
         const onMount = async () => {
-            // Get the defualt site from the async storage
-            // Also check if the app was started by a notification
-            const initialNotification = await messaging.getInitialNotification();
-
-            if (initialNotification) {
-                if (initialNotification.data?.channel_id && initialNotification.data?.sitename) {
-                    setDefaultSite(initialNotification.data.sitename as string)
-                    let path = 'chat'
-                    if (initialNotification.data.is_thread) {
-                        path = 'thread'
+
+            try {
+                // Get the defualt site from the async storage
+                // Also check if the app was started by a notification
+                const initialNotification = await messaging.getInitialNotification();
+
+                if (initialNotification) {
+                    if (initialNotification.data?.channel_id && initialNotification.data?.sitename) {
+                        setDefaultSite(initialNotification.data.sitename as string)
+                        let path = 'chat'
+                        if (initialNotification.data.is_thread) {
+                            path = 'thread'
+                        }
+                        router.navigate(`/${initialNotification.data.sitename}/${path}/${initialNotification.data.channel_id}`, {
+                            withAnchor: true
+                        })
+
+                        return
                     }
-                    router.navigate(`/${initialNotification.data.sitename}/${path}/${initialNotification.data.channel_id}`, {
-                        withAnchor: true
-                    })
+                }
 
-                    return
+                // If not started by notification
+                // On load, check if the user has a site set
+                const defaultSite = await getItem()
+                if (defaultSite) {
+                    router.replace(`/${defaultSite}`)
+                } else {
+                    router.replace('/landing')
                 }
-            }
 
-            // If not started by notification
-            // On load, check if the user has a site set
-            const defaultSite = await getItem()
-            if (defaultSite) {
-                router.replace(`/${defaultSite}`)
-            } else {
-                router.replace('/landing')
+            } catch (error) {
+                console.warn('Error during app initialization:', error);
+                router.replace('/landing');
+            } finally {
+                // mark app as ready regardless of success or failure
+                setAppIsReady(true);
             }
+
         }
 
         // Handle notification open when app is in background
@@ -104,11 +138,12 @@ export default function RootLayout() {
         };
     }, []);
 
-    const { colorScheme, setColorScheme } = useColorScheme();
-
-    const isDarkColorScheme = colorScheme === 'dark'
-
-    const [theme] = useAtom(themeAtom);
+    // Hide splash screen when app is ready
+    useEffect(() => {
+        if (appIsReady) {
+            SplashScreen.hide();
+        }
+    }, [appIsReady]);
 
     useEffect(() => {
         if (theme.state === 'hasData') {
@@ -157,4 +192,4 @@ export default function RootLayout() {
             </GestureHandlerRootView>
         </>
     )
-}
+}
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -55,6 +55,7 @@
     "expo-router": "~4.0.20",
     "expo-secure-store": "~14.0.1",
     "expo-sharing": "~13.0.1",
+    "expo-splash-screen": "~0.29.24",
     "expo-status-bar": "~2.0.1",
     "expo-system-ui": "~4.0.9",
     "expo-video": "~2.0.5",
diff --git a/frontend/src/components/feature/chat/ChatMessage/Renderers/PollMessage.tsx b/frontend/src/components/feature/chat/ChatMessage/Renderers/PollMessage.tsx
@@ -60,7 +60,6 @@ const PollMessageBox = ({ data, messageID }: { data: Poll, messageID: string })
                         {data.poll.is_anonymous ? <Badge color='blue' className={'w-fit'}>Anonymous</Badge> : null}
                     </Flex>
                     {data.poll.is_disabled ? <Text color="gray" size='1'>
-                        <IoLockClosed />
                         Poll is now closed. No more votes will be accepted.
                     </Text> : null}
                     {data.poll.end_date && !data.poll.is_disabled && (
diff --git a/frontend/src/components/feature/polls/ViewPollVotes.tsx b/frontend/src/components/feature/polls/ViewPollVotes.tsx
@@ -55,7 +55,7 @@ export const ViewPollVotes = ({ poll }: ViewPollVotesProps) => {
                 <Button variant='ghost' size={'1'} className='bg-transparent hover:text-accent-10 w-full'>{buttonText}</Button>
             </DrawerTrigger>
             <DrawerContent>
-                <div className='h-[80vh]'>
+                <div className='h-[80vh] overflow-y-auto'>
                     <ViewPollVotesModalContent
                         onClose={onClose}
                         poll={poll} />
@@ -91,6 +91,7 @@ const ViewPollVotesModalContent = ({ onClose, poll }: ViewPollVotesModalContentP
 }
 
 const VotesBlock = ({ votesData, poll }: { votesData: PollVotesResponse, poll: Poll }) => {
+
     return (
         <Flex direction={'column'}>
             <Dialog.Title>
@@ -101,11 +102,10 @@ const VotesBlock = ({ votesData, poll }: { votesData: PollVotesResponse, poll: P
             </Dialog.Title>
 
             <Separator className='w-full' />
-            <ScrollArea className='h-[76vh]' type='scroll'>
                 <Flex direction={'column'} className='py-4 pr-3' gap={'2'}>
                     <Text size={'3'} weight={'bold'}>{poll.poll.question}</Text>
-                    {votesData && Object.keys(votesData).map((opt) => {
-                        const option = votesData[opt]
+                {votesData && Object.keys(votesData).map((opt) => {
+                    const option = votesData[opt]
                         const optionName = poll.poll.options.find(o => o.name === opt)?.option
                         return (
                             <div>
@@ -127,7 +127,6 @@ const VotesBlock = ({ votesData, poll }: { votesData: PollVotesResponse, poll: P
                         )
                     })}
                 </Flex>
-            </ScrollArea>
         </Flex>
     )
 }
@@ -142,4 +141,4 @@ const UserVote = ({ user_id }: { user_id: string }) => {
             <Text as='span' className='block' weight='medium' size='2'>{user?.full_name}</Text>
         </div>
     </Flex>
-}
+}
diff --git a/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx b/frontend/src/components/feature/threads/ThreadDrawer/ThreadHeader.tsx
@@ -10,8 +10,9 @@ import useFetchChannelMembers, { Member } from "@/hooks/fetchers/useFetchChannel
 import { useContext, useMemo } from "react"
 import useIsPushNotificationEnabled from "@/hooks/fetchers/useIsPushNotificationEnabled"
 import { UserContext } from "@/utils/auth/UserProvider"
+import { LuExternalLink } from "react-icons/lu"
 
-export const ThreadHeader = () => {
+export const ThreadHeader = ({ channelID }: { channelID?: string }) => {
 
     const navigate = useNavigate()
 
@@ -28,6 +29,10 @@ export const ThreadHeader = () => {
         return null
     }, [user, channelMembers])
 
+    const onViewMessageInChannel = () => {
+        navigate(`../../${channelID}?message_id=${threadID}`)
+    }
+
     return (
         <header className='dark:bg-gray-2 bg-white fixed top-0 px-3 sm:w-[calc((100vw-var(--sidebar-width)-var(--space-8))/2)] w-screen' style={{ zIndex: 999 }}>
             <Flex direction={'column'} gap='2' className='pt-3'>
@@ -42,6 +47,12 @@ export const ThreadHeader = () => {
                                     </IconButton>
                                 </DropdownMenu.Trigger>
                                 <DropdownMenu.Content className='min-w-48'>
+                                    {channelID && <DropdownMenu.Item onClick={onViewMessageInChannel}>
+                                        <Flex gap='2' align='center'>
+                                            <LuExternalLink size={'16'} />
+                                            View Message
+                                        </Flex>
+                                    </DropdownMenu.Item>}
                                     <ToggleNotificationButton channelMember={channelMember} />
                                     <LeaveThreadButton />
                                     {channelMembers[currentUser].is_admin === 1 && <DeleteThreadButton />}
diff --git a/frontend/src/components/feature/threads/ThreadManager/ViewThread.tsx b/frontend/src/components/feature/threads/ThreadManager/ViewThread.tsx
@@ -26,7 +26,7 @@ const ViewThread = () => {
     return (
         <div>
             <Flex direction='column' gap='0' className='w-full h-screen'>
-                <ThreadHeader />
+                <ThreadHeader channelID={data?.channel_id} />
                 {isLoading && <FullPageLoader />}
                 {error && <Box p='4'><ErrorBanner error={error} /></Box>}
                 {data && <ThreadMessages threadMessage={data} key={threadID} />}
diff --git a/frontend/src/pages/settings/PushNotifications.tsx b/frontend/src/pages/settings/PushNotifications.tsx
@@ -215,15 +215,7 @@ const PushNotifications = () => {
                                 <RegisterSiteButton mutate={mutate} ravenSettings={ravenSettings} />}
 
                             {isRavenCloud && ravenSettings?.push_notification_service === "Raven"
-                                && ravenSettings?.push_notification_server_url && ravenSettings?.vapid_public_key && <Button
-                                    onClick={() => call.post('raven.api.notification.sync_user_tokens_to_raven_cloud').then(() => {
-                                        toast.success('Data syncing to Raven Cloud...')
-                                    })}
-                                    type='button'
-                                    variant='soft'
-                                    className='not-cal'>
-                                    Sync Data to Raven Cloud
-                                </Button>}
+                                && ravenSettings?.push_notification_server_url && ravenSettings?.vapid_public_key && <SyncDataButton />}
 
                             {!isRavenCloud && <Button
                                 asChild
@@ -270,4 +262,25 @@ const RegisterSiteButton = ({ mutate, ravenSettings }: { mutate: VoidFunction, r
 
 }
 
+const SyncDataButton = () => {
+    const { call, loading } = useFrappePostCall('raven.api.notification.sync_user_tokens_to_raven_cloud')
+
+    const syncData = () => {
+        toast.promise(call({}), {
+            loading: 'Syncing data to Raven Cloud...',
+            success: 'Data synced to Raven Cloud.',
+            error: (error) => 'Failed to sync data to Raven Cloud. ' + (getErrorMessage(error))
+        })
+    }
+
+    return <Button
+        onClick={syncData}
+        disabled={loading}
+        variant='soft'
+        type='button'
+        className='not-cal'>
+        {loading ? "Syncing Data to Raven Cloud..." : "Sync Data to Raven Cloud"}
+    </Button>
+}
+
 export const Component = PushNotifications
diff --git a/raven/__init__.py b/raven/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.8.6"
+__version__ = "2.8.7"
 
 from raven.raven_integrations.doctype.raven_incoming_webhook.raven_incoming_webhook import (  # noqa
 	handle_incoming_webhook as webhook,
diff --git a/raven/api/notification.py b/raven/api/notification.py
@@ -104,6 +104,14 @@ def unsubscribe(fcm_token: str) -> None:
 	Remove the FCM token from the database
 	"""
 
-	frappe.db.delete("Raven Push Token", {"fcm_token": fcm_token, "user": frappe.session.user})
+	# Check if the FCM token exists
+	token_name = frappe.db.exists(
+		"Raven Push Token", {"fcm_token": fcm_token, "user": frappe.session.user}
+	)
+	if not token_name:
+		frappe.throw(_("FCM token not found"))
+
+	# Delete the FCM token from the database using delete_doc to ensure that on_trash method gets called to delete the token from RC/FCP.
+	frappe.delete_doc("Raven Push Token", token_name)
 
 	return "Unsubscribed"
diff --git a/raven/hooks.py b/raven/hooks.py
@@ -172,7 +172,10 @@
 	# "monthly": [
 	# 	"raven.scheduler.monthly"
 	# ],
-	"daily_maintenance": ["raven.scheduler.daily.sync_invalid_tokens"],
+	"daily_maintenance": [
+		"raven.scheduler.daily.sync_invalid_tokens",
+		"raven.raven_cloud_notifications.sync_users_tokens_to_raven_cloud",
+	],
 	"cron": {
 		# run every 5 minutes
 		"*/5 * * * *": ["raven.scheduler.close_expired_polls.close_expired_polls"]
diff --git a/raven/raven_cloud_notifications.py b/raven/raven_cloud_notifications.py
@@ -65,8 +65,21 @@ def sync_users_tokens_to_raven_cloud():
 	raven_settings = frappe.get_single("Raven Settings")
 	tokens = frappe.db.get_all("Raven Push Token", fields=["user", "fcm_token"], order_by="user")
 
-	# We need to divide these into chunks of 10
-	chunks = [tokens[i : i + 10] for i in range(0, len(tokens), 10)]
+	# Group tokens by user to ensure all tokens for a user are in the same chunk
+	user_tokens = {}
+	for token in tokens:
+		user_tokens.setdefault(token["user"], []).append(token)
+
+		# Build chunks where all tokens for a user stay together
+	chunks = []
+	current_chunk = []
+	for user, user_token_list in user_tokens.items():
+		if len(current_chunk) + len(user_token_list) > 10 and current_chunk:
+			chunks.append(current_chunk)
+			current_chunk = []
+		current_chunk.extend(user_token_list)
+	if current_chunk:
+		chunks.append(current_chunk)
 
 	for chunk in chunks:
 		client = FrappeClient(
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = "2.8.6"`
	`1`	`+__version__ = "2.8.7"`
`2`	`2`
`3`	`3`	`from raven.raven_integrations.doctype.raven_incoming_webhook.raven_incoming_webhook import ( # noqa`
`4`	`4`	`handle_incoming_webhook as webhook,`