Merge branch 'dp/calendar-sync' into dev

# Conflicts:
#	components/pages/settings/CalendarSettingsPage.tsx
#	yarn.lock
This commit is contained in:
Milan Paunovic
2024-10-06 00:07:24 +02:00
18 changed files with 987 additions and 740 deletions
+20
View File
@@ -16,6 +16,7 @@
"@react-native-firebase/crashlytics": "^20.3.0",
"@react-native-firebase/firestore": "^20.4.0",
"@react-native-firebase/functions": "^20.4.0",
"@react-native-google-signin/google-signin": "^13.1.0",
"@react-navigation/drawer": "^6.7.2",
"@react-navigation/native": "^6.0.2",
"date-fns": "^3.6.0",
@@ -6527,6 +6528,25 @@
"@react-native-firebase/app": "20.4.0"
}
},
"node_modules/@react-native-google-signin/google-signin": {
"version": "13.1.0",
"resolved": "https://registry.npmjs.org/@react-native-google-signin/google-signin/-/google-signin-13.1.0.tgz",
"integrity": "sha512-C2/sqb0/s0c+Dwc/mykASZsRuHxGqn7SFrCxCY9D8p8IOQO05haInhCc7lzraJshRixGva5c/4usQZ71HMYSEQ==",
"peerDependencies": {
"expo": ">=50.0.0",
"react": "*",
"react-dom": "*",
"react-native": "*"
},
"peerDependenciesMeta": {
"expo": {
"optional": true
},
"react-dom": {
"optional": true
}
}
},
"node_modules/@react-native/assets-registry": {
"version": "0.74.85",
"resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.74.85.tgz",