Skip to content

Commit 2c59bff

Browse files
thierryskodathierryskoda
authored
feat: Expo notifications + many other fixes (#1647)
1 parent b718196 commit 2c59bff

File tree

149 files changed

+2900
-1737
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+2900
-1737
lines changed

‎App.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import React from "react"
1717
import { GestureHandlerRootView } from "react-native-gesture-handler"
1818
import { KeyboardProvider } from "react-native-keyboard-controller"
1919
import { SafeAreaProvider } from "react-native-safe-area-context"
20+
// import { useSyncQueries } from "tanstack-query-dev-tools-expo-plugin"
2021
import { ThirdwebProvider } from "thirdweb/react"
2122
import { base } from "viem/chains"
2223
// import { DevToolsBubble } from "react-native-react-query-devtools"
@@ -25,7 +26,7 @@ import { setupConvosApi } from "@/utils/convos-api/convos-api-init"
2526
import { ReactQueryPersistProvider } from "@/utils/react-query/react-query-persist-provider"
2627
import { config } from "./config"
2728
import { useMonitorNetworkConnectivity } from "./dependencies/NetworkMonitor/use-monitor-network-connectivity"
28-
import { registerBackgroundNotificationTask } from "./features/notifications/background-notification-handler"
29+
import { registerBackgroundNotificationTask } from "./features/notifications/background-notifications-handler"
2930
import { setupConversationsNotificationsSubscriptions } from "./features/notifications/notifications-conversations-subscriptions"
3031
import { configureForegroundNotificationBehavior } from "./features/notifications/notifications-init"
3132
import { AppNavigator } from "./navigation/app-navigator"
@@ -60,6 +61,9 @@ export function App() {
6061
useCachedResources()
6162
useCoinbaseWalletListener()
6263

64+
// Seems to be slowing the app. Need to investigate
65+
// useSyncQueries({ queryClient: reactQueryClient })
66+
6367
const { themeScheme, setThemeContextOverride, ThemeProvider } = useThemeProvider()
6468

6569
return (

‎components/avatar.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export type IAvatarProps = {
1212
name: Nullable<string>
1313
source?: Nullable<string | ImageSourcePropType>
1414
uri?: Nullable<string> // Kept for backward compatibility
15-
size?: "sm" | "md" | "lg" | "xl"
15+
size?: "sm" | "md" | "lg" | "xl" | "xxl"
1616
sizeNumber?: number
1717
style?: StyleProp<ViewStyle>
1818
}
@@ -36,6 +36,7 @@ export const Avatar = memo(function Avatar({
3636
md: theme.avatarSize.md,
3737
lg: theme.avatarSize.lg,
3838
xl: theme.avatarSize.xl,
39+
xxl: theme.avatarSize.xxl,
3940
}[size]
4041

4142
// Use source if provided, otherwise fall back to uri for backward compatibility

‎components/debug-provider.tsx

+57-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { VStack } from "@/design-system/VStack"
1111
import { useLogout } from "@/features/authentication/use-logout"
1212
import {
1313
canAskForNotificationsPermissions,
14-
getPushNotificationsToken,
14+
getDevicePushNotificationsToken,
1515
registerPushNotifications,
1616
requestNotificationsPermissions,
1717
userHasGrantedNotificationsPermissions,
@@ -178,7 +178,7 @@ function useShowDebugMenu() {
178178
try {
179179
await method()
180180
} catch (error) {
181-
captureError(error)
181+
captureError(new GenericError({ error, additionalMessage: "Error showing logs menu" }))
182182
}
183183
}
184184
},
@@ -244,7 +244,12 @@ function useShowDebugMenu() {
244244
.join("\n"),
245245
)
246246
} catch (error) {
247-
captureError(error)
247+
captureError(
248+
new GenericError({
249+
error,
250+
additionalMessage: "Error checking notification permissions",
251+
}),
252+
)
248253
Alert.alert("Error", "Failed to check notification permissions")
249254
}
250255
},
@@ -254,7 +259,12 @@ function useShowDebugMenu() {
254259

255260
Alert.alert("Permission Request Result", `Granted: ${result.granted ? "YES" : "NO"}`)
256261
} catch (error) {
257-
captureError(error)
262+
captureError(
263+
new GenericError({
264+
error,
265+
additionalMessage: "Error requesting notification permissions",
266+
}),
267+
)
258268
Alert.alert("Error", "Failed to request notification permissions")
259269
}
260270
},
@@ -278,15 +288,25 @@ function useShowDebugMenu() {
278288
"Push notification registration process completed successfully.",
279289
)
280290
} catch (error) {
281-
captureError(error)
291+
captureError(
292+
new GenericError({
293+
error,
294+
additionalMessage: "Error registering for push notifications",
295+
}),
296+
)
282297
Alert.alert("Error", "Failed to register for push notifications")
283298
}
284299
},
285300
},
286301
],
287302
)
288303
} catch (error) {
289-
captureError(error)
304+
captureError(
305+
new GenericError({
306+
error,
307+
additionalMessage: "Error registering for push notifications",
308+
}),
309+
)
290310
Alert.alert("Error", "Failed to register for push notifications")
291311
}
292312
},
@@ -314,13 +334,18 @@ function useShowDebugMenu() {
314334
},
315335
])
316336
} catch (error) {
317-
captureError(error)
337+
captureError(
338+
new GenericError({
339+
error,
340+
additionalMessage: "Error getting badge count",
341+
}),
342+
)
318343
Alert.alert("Error", "Failed to get badge count")
319344
}
320345
},
321346
"Get Device Token": async () => {
322347
try {
323-
const token = await getPushNotificationsToken()
348+
const token = await getDevicePushNotificationsToken()
324349
Alert.alert("Device Token", token || "No token available", [
325350
{
326351
text: "Copy",
@@ -337,7 +362,12 @@ function useShowDebugMenu() {
337362
},
338363
])
339364
} catch (error) {
340-
captureError(error)
365+
captureError(
366+
new GenericError({
367+
error,
368+
additionalMessage: "Error getting device token",
369+
}),
370+
)
341371
Alert.alert("Error", "Failed to get device token. Make sure permissions are granted.")
342372
}
343373
},
@@ -357,7 +387,12 @@ function useShowDebugMenu() {
357387
Alert.alert("Notification Categories", categoryDetails)
358388
}
359389
} catch (error) {
360-
captureError(error)
390+
captureError(
391+
new GenericError({
392+
error,
393+
additionalMessage: "Error getting notification categories",
394+
}),
395+
)
361396
Alert.alert("Error", "Failed to get notification categories")
362397
}
363398
},
@@ -373,7 +408,12 @@ function useShowDebugMenu() {
373408
})
374409
Alert.alert("Notification Sent", "Test notification has been scheduled")
375410
} catch (error) {
376-
captureError(error)
411+
captureError(
412+
new GenericError({
413+
error,
414+
additionalMessage: "Error sending test notification",
415+
}),
416+
)
377417
Alert.alert("Error", "Failed to schedule test notification")
378418
}
379419
},
@@ -400,7 +440,12 @@ function useShowDebugMenu() {
400440
try {
401441
await method()
402442
} catch (error) {
403-
captureError(error)
443+
captureError(
444+
new GenericError({
445+
error,
446+
additionalMessage: "Error showing notifications menu",
447+
}),
448+
)
404449
}
405450
}
406451
},

‎components/group-avatar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Text } from "@/design-system/Text"
66
import { VStack } from "@/design-system/VStack"
77
import { useSafeCurrentSender } from "@/features/authentication/multi-inbox.store"
88
import { IConversationTopic } from "@/features/conversation/conversation.types"
9-
import { useGroupQuery } from "@/features/groups/group.query"
9+
import { useGroupQuery } from "@/features/groups/queries/group.query"
1010
import { usePreferredDisplayInfoBatch } from "@/features/preferred-display-info/use-preferred-display-info-batch"
1111
import { $globalStyles } from "@/theme/styles"
1212
import { ThemedStyle, useAppTheme } from "@/theme/use-app-theme"

‎config/shared.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const shared = {
4848
thirdwebClientId: process.env.EXPO_PUBLIC_THIRDWEB_CLIENT_ID,
4949
reactQueryEncryptionKey: process.env.EXPO_PUBLIC_SECURE_REACT_QUERY_ENCRYPTION_KEY,
5050
reactQueryPersistCacheIsEnabled:
51-
process.env.EXPO_PUBLIC_ENABLE_REACT_QUERY_PERSIST_CACHE === "true",
51+
process.env.EXPO_PUBLIC_ENABLE_REACT_QUERY_PERSIST_CACHE !== "false",
5252
appCheckDebugToken:
5353
Platform.OS === "android"
5454
? process.env.EXPO_PUBLIC_FIREBASE_APP_CHECK_DEBUG_TOKEN_ANDROID

‎design-system/TextField/TextField.props.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export type TextFieldProps = {
4141
/**
4242
* The helper text to display if not using `helperTx`.
4343
*/
44-
helper?: ITextProps["text"]
44+
helper?: ITextProps["text"] | React.ReactNode
4545
/**
4646
* Helper text which is looked up via i18n.
4747
*/

‎design-system/TextField/TextField.tsx

+21-11
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ export const TextField = forwardRef(function TextField(
6767
$inputStyleOverride,
6868
]
6969

70+
const $helperContainerStyle: ThemedStyle<ViewStyle> = ({ spacing }) => ({
71+
marginTop: spacing.xxxs,
72+
paddingHorizontal: spacing.xs,
73+
})
74+
7075
const $helperStyles = [
7176
$helperStyle,
7277
status === "error" && { color: theme.colors.global.caution },
@@ -141,14 +146,20 @@ export const TextField = forwardRef(function TextField(
141146
</HStack>
142147

143148
{!!(helper || helperTx) && (
144-
<Text
145-
preset="formHelper"
146-
text={helper}
147-
tx={helperTx}
148-
txOptions={helperTxOptions}
149-
{...HelperTextProps}
150-
style={themed($helperStyles)}
151-
/>
149+
<VStack style={themed($helperContainerStyle)}>
150+
{typeof helper === "string" ? (
151+
<Text
152+
preset="formHelper"
153+
text={helper}
154+
tx={helperTx}
155+
txOptions={helperTxOptions}
156+
{...HelperTextProps}
157+
style={themed($helperStyles)}
158+
/>
159+
) : (
160+
helper
161+
)}
162+
</VStack>
152163
)}
153164
</TouchableOpacity>
154165
)
@@ -177,9 +188,8 @@ const $inputWrapperStyle: ThemedStyle<ViewStyle> = ({
177188
paddingVertical: spacing.xxs,
178189
})
179190

180-
const $helperStyle: ThemedStyle<TextStyle> = ({ spacing }) => ({
181-
marginTop: spacing.xxxs,
182-
paddingHorizontal: spacing.xs,
191+
const $helperStyle: ThemedStyle<TextStyle> = () => ({
192+
// Only text-specific styles here
183193
})
184194

185195
const $rightAccessoryStyle: ThemedStyle<ViewStyle> = ({ spacing }) => ({

‎eslint.config.mjs

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ const config = {
7575
"react/react-in-jsx-scope": "off",
7676
"react/jsx-key": "error",
7777
"react/jsx-no-bind": "off",
78+
"react/jsx-no-target-blank": "off", // Was causing weird eslint issues
7879

7980
"typescript-eslint/no-unused-vars": [
8081
"warn",

‎features/auth-onboarding/components/auth-onboarding-contact-card/auth-onboarding-contact-card-footer.tsx

+12-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import { showSnackbar } from "@/components/snackbar/snackbar.service"
66
import { VStack } from "@/design-system/VStack"
77
import { OnboardingFooter } from "@/features/auth-onboarding/components/onboarding-footer"
88
import { useAuthOnboardingStore } from "@/features/auth-onboarding/stores/auth-onboarding.store"
9+
import { IPrivyUserId } from "@/features/authentication/authentication.types"
910
import { hydrateAuth } from "@/features/authentication/hydrate-auth"
1011
import { useMultiInboxStore } from "@/features/authentication/multi-inbox.store"
11-
import { useCreateUserMutation } from "@/features/current-user/use-create-user"
12+
import { useCreateUserMutation } from "@/features/current-user/create-user.mutation"
1213
import { captureErrorWithToast } from "@/utils/capture-error"
14+
import { GenericError } from "@/utils/error"
1315
import { waitUntilPromise } from "@/utils/wait-until-promise"
1416
import { getFirstZodValidationError, isZodValidationError } from "@/utils/zod"
1517

@@ -49,12 +51,13 @@ export const AuthOnboardingContactCardFooter = memo(function AuthOnboardingConta
4951

5052
await createUserAsync({
5153
inboxId: currentSender.inboxId,
52-
privyUserId: privyUser.id,
54+
privyUserId: privyUser.id as IPrivyUserId,
5355
smartContractWalletAddress: currentSender.ethereumAddress,
5456
profile: {
5557
name: store.name,
5658
username: store.username,
57-
...(store.avatar && { avatar: store.avatar }),
59+
avatar: store.avatar ?? null,
60+
description: null, // For now there's no field for description in the onboarding
5861
},
5962
})
6063

@@ -75,9 +78,12 @@ export const AuthOnboardingContactCardFooter = memo(function AuthOnboardingConta
7578
type: "error",
7679
})
7780
} else {
78-
captureErrorWithToast(error, {
79-
message: "An unexpected error occurred. Please try again.",
80-
})
81+
captureErrorWithToast(
82+
new GenericError({
83+
error,
84+
additionalMessage: "An unexpected error occurred. Please try again.",
85+
}),
86+
)
8187
}
8288
} finally {
8389
setPressedOnContinue(false)

‎features/auth-onboarding/contexts/auth-onboarding.context.tsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { createXmtpClient } from "@/features/xmtp/xmtp-client/xmtp-client"
1919
import { validateXmtpInstallation } from "@/features/xmtp/xmtp-installations/xmtp-installations"
2020
import { IXmtpInboxId } from "@/features/xmtp/xmtp.types"
2121
import { captureError, captureErrorWithToast } from "@/utils/capture-error"
22+
import { AuthenticationError } from "@/utils/error"
2223
import { IEthereumAddress } from "@/utils/evm/address"
2324
import { authLogger } from "@/utils/logger"
2425
import { tryCatch } from "@/utils/try-catch"
@@ -147,9 +148,9 @@ export const AuthOnboardingContextProvider = (props: IAuthOnboardingContextProps
147148
) {
148149
// User cancelled the passkey login
149150
} else {
150-
captureErrorWithToast(error, {
151-
message: "Failed to login with passkey",
152-
})
151+
captureErrorWithToast(
152+
new AuthenticationError({ error, additionalMessage: "Failed to login with passkey" }),
153+
)
153154
}
154155
} finally {
155156
useAuthOnboardingStore.getState().actions.setIsProcessingWeb3Stuff(false)
@@ -230,9 +231,9 @@ export const AuthOnboardingContextProvider = (props: IAuthOnboardingContextProps
230231
) {
231232
// User cancelled the passkey registration
232233
} else {
233-
captureErrorWithToast(error, {
234-
message: "Failed to sign up with passkey",
235-
})
234+
captureErrorWithToast(
235+
new AuthenticationError({ error, additionalMessage: "Failed to sign up with passkey" }),
236+
)
236237
}
237238
} finally {
238239
useAuthOnboardingStore.getState().actions.setIsProcessingWeb3Stuff(false)

‎features/authentication/authentication.api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { z } from "zod"
2+
import { ApiError } from "@/utils/convos-api/convos-api-error"
23
import { convosApi } from "@/utils/convos-api/convos-api-instance"
3-
import { ApiError } from "@/utils/error"
44
import { AUTHENTICATE_ROUTE } from "./authentication.constants"
55

66
const fetchJwtResponseSchema = z.object({

0 commit comments

Comments
 (0)