Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions mobile/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,21 @@
"resizeMode": "contain",
"backgroundColor": "#FDD20C"
},
"assetBundlePatterns": [
"**/*"
],
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "org.commitglobal.votemonitor",
"buildNumber": "96",
"buildNumber": "107",
"config": {
"usesNonExemptEncryption": false
},
"infoPlist": {
"UIBackgroundModes": [
"fetch",
"remote-notification"
]
"UIBackgroundModes": ["fetch", "remote-notification"]
}
},
"android": {
"softwareKeyboardLayoutMode": "pan",
"versionCode": 97,
"versionCode": 110,
"adaptiveIcon": {
"foregroundImage": "./assets/icons/adaptive-icon.png",
"backgroundColor": "#FDD20C"
Expand Down Expand Up @@ -79,18 +74,26 @@
"color": "#FDD20C"
}
],
[
"@morrowdigital/watermelondb-expo-plugin"
],
["@lovesworking/watermelondb-expo-plugin-sdk-52-plus"],
[
"expo-build-properties",
{
"ios": {
"extraPods": [
{
"name": "simdjson",
"configurations": ["Debug", "Release"],
"path": "../node_modules/@nozbe/simdjson",
"modular_headers": true
}
]
},
"android": {
"kotlinVersion": "1.6.10",
"compileSdkVersion": 35,
"targetSdkVersion": 35,
"buildToolsVersion": "35.0.0",
"packagingOptions": {
"pickFirst": [
"**/libc++_shared.so"
]
"pickFirst": ["**/libc++_shared.so"]
}
}
}
Expand All @@ -114,4 +117,4 @@
"react-native-compressor"
]
}
}
}
13 changes: 3 additions & 10 deletions mobile/app/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import * as Notifications from "expo-notifications";
import AppModeContextProvider from "../contexts/app-mode/AppModeContext.provider";

// Construct a new instrumentation instance. This is needed to communicate between the integration and React
const routingInstrumentation = new Sentry.ReactNavigationInstrumentation();
const routingIntegration = Sentry.reactNavigationIntegration();

// replace console.* for disable log on production
if (process.env.NODE_ENV === "production") {
Expand Down Expand Up @@ -47,14 +47,7 @@ Sentry.init({
// of transactions for performance monitoring.
// We recommend adjusting this value in production
tracesSampleRate: process.env.EXPO_PUBLIC_ENVIRONMENT === "production" ? 0.2 : 0,
integrations: [
new Sentry.ReactNativeTracing({
// Pass instrumentation to be used as `routingInstrumentation`
routingInstrumentation,
enableNativeFramesTracking: !isRunningInExpoGo(),
// ...
}),
],
integrations: [Sentry.reactNativeTracingIntegration()],
});

SplashScreen.preventAutoHideAsync();
Expand All @@ -74,7 +67,7 @@ function RootLayout() {

React.useEffect(() => {
if (ref) {
routingInstrumentation.registerNavigationContainer(ref);
routingIntegration.registerNavigationContainer(ref);
}
}, [ref]);

Expand Down
6 changes: 3 additions & 3 deletions mobile/app/citizen/main/(drawer)/_layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { ScrollViewProps } from "react-native";
import { ScrollView, useTheme, XStack, YStack } from "tamagui";
import { useSafeAreaInsets } from "react-native-safe-area-context";
import { DrawerActions } from "@react-navigation/native";
import { useNavigation } from "expo-router";
import { useNavigationContainerRef } from "expo-router";
import { AppModeSwitchButton } from "../../../../components/AppModeSwitchButton";
import { Icon } from "../../../../components/Icon";
import { Typography } from "../../../../components/Typography";
Expand All @@ -21,7 +21,7 @@ type DrawerContentProps = ScrollViewProps & {

export const DrawerContent = (props: DrawerContentProps) => {
const insets = useSafeAreaInsets();
const navigation = useNavigation();
const navigation = useNavigationContainerRef();
const theme = useTheme();

const appVersion = Constants.expoConfig?.version;
Expand All @@ -31,7 +31,7 @@ export const DrawerContent = (props: DrawerContentProps) => {

const handleSelectElectionRound = (electionRoundId: string) => {
setSelectedElectionRound(electionRoundId);
navigation.dispatch(DrawerActions.closeDrawer());
navigation.dispatch({ type: "TOGGLE_DRAWER" });
};

return (
Expand Down
Loading
Loading