Skip to content

Commit

Permalink
Merge branch 'release-2.59.0' into fix-bottom-sheet-zindex-issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@gewfy
gewfy committed Jan 1, 2025
2 parents 1a17c0e + 56d1d9d commit 2d5f294
Show file tree
Hide file tree
Showing 176 changed files with 5,058 additions and 1,418 deletions.
20 changes: 10 additions & 10 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
"@gorhom/bottom-sheet": "^5.0.6",
"@kingstinct/react-native-healthkit": "^8.2.0",
"@lottiefiles/react-lottie-player": "^3.5.4",
"@notifee/react-native": "^9.1.1",
"@notifee/react-native": "^9.1.3",
"@react-native-async-storage/async-storage": "^1.24.0",
"@react-native-community/datetimepicker": "^8.2.0",
"@react-native-community/netinfo": "^11.3.2",
"@react-native-community/netinfo": "^11.4.1",
"@react-native-firebase/app": "^20.3.0",
"@react-native-firebase/auth": "^20.3.0",
"@react-native-firebase/dynamic-links": "^20.3.0",
Expand All @@ -54,32 +54,32 @@
"intl-pluralrules": "^2.0.1",
"lodash.throttle": "^4.1.1",
"lottie-react-native": "^6.7.2",
"posthog-react-native": "^3.3.9",
"posthog-react-native": "^3.6.1",
"ramda": "^0.30.1",
"react": "18.2.0",
"react-i18next": "^15.0.1",
"react-markdown": "^9.0.1",
"react-native": "0.74.3",
"react-native-action-sheet": "^2.2.0",
"react-native-add-calendar-event": "^5.0.0",
"react-native-awesome-slider": "^2.5.6",
"react-native-awesome-slider": "^2.9.0",
"react-native-background-timer": "^2.3.1",
"react-native-circular-progress": "^1.4.1",
"react-native-code-push": "^9.0.0",
"react-native-device-info": "^11.1.0",
"react-native-device-info": "^14.0.2",
"react-native-gesture-handler": "^2.21.2",
"react-native-get-random-values": "^1.11.0",
"react-native-haptic-feedback": "^2.2.0",
"react-native-haptic-feedback": "^2.3.3",
"react-native-idle-timer": "^2.2.3",
"react-native-image-crop-picker": "^0.41.2",
"react-native-image-crop-picker": "^0.41.6",
"react-native-linear-gradient": "^2.8.3",
"react-native-localize": "^3.2.1",
"react-native-markdown-display": "^7.0.2",
"react-native-permissions": "^4.1.5",
"react-native-rate": "^1.2.12",
"react-native-reanimated": "^3.16.4",
"react-native-safe-area-context": "^4.10.9",
"react-native-screens": "^4.3.0",
"react-native-safe-area-context": "^4.14.0",
"react-native-screens": "^4.4.0",
"react-native-svg": "^15.8.0",
"react-native-volume-manager": "^1.10.0",
"react-native-web": "^0.19.13",
Expand All @@ -90,7 +90,7 @@
"styled-components": "^6.1.12",
"uuid": "^10.0.0",
"vtt-to-json": "^0.1.1",
"yup": "^1.4.0",
"yup": "^1.6.1",
"zustand": "^4.5.5"
},
"devDependencies": {
Expand Down
5 changes: 4 additions & 1 deletion client/src/lib/components/VideoLooper/VideoLooper.web.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ import React, {
import {VideoLooperProperties} from './VideoLooper';
import styled from 'styled-components';

const useCanvasColorCorrection = !(
const useCanvasColorCorrection = false; // Currently disabled because of rendering issues on Windows
/*
!(
typeof window !== 'undefined' &&
/^((?!chrome|android).)*safari/i.test(navigator.userAgent)
); // Not Safari
*/

const Wrapper = styled.div({
position: 'relative',
Expand Down
91 changes: 43 additions & 48 deletions client/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2628,10 +2628,10 @@
"@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"

"@notifee/react-native@^9.1.1":
version "9.1.1"
resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-9.1.1.tgz#81f81570442c27fcd7f968692912f39d8d1bec54"
integrity sha512-d9UdnT7TIJKal+RSCcl81beveWXjBpNZZ+8rqzcfd8DcAlkl7WGvvIAhUfkb83aOfc/zHpZJrJwu4fxwI6GCCg==
"@notifee/react-native@^9.1.3":
version "9.1.3"
resolved "https://registry.yarnpkg.com/@notifee/react-native/-/react-native-9.1.3.tgz#974b4b3d6ffc12109644a2634e81ac09195bbf95"
integrity sha512-KUshWu/MCYHCbVIVGwevQc7si0IA76uKGV7a0qbnCZlVFkuQvCUrrHzM2HWBhQ0+8dB1g6jPJxipNeXDWHELVw==

"@opentelemetry/api@^1.0.1":
version "1.4.1"
Expand Down Expand Up @@ -3065,10 +3065,10 @@
dependencies:
invariant "^2.2.4"

"@react-native-community/netinfo@^11.3.2":
version "11.3.2"
resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.3.2.tgz#e63201d0b87ad42d086d1003be48ae7b327f0594"
integrity sha512-YsaS3Dutnzqd1BEoeC+DEcuNJedYRkN6Ef3kftT5Sm8ExnCF94C/nl4laNxuvFli3+Jz8Df3jO25Jn8A9S0h4w==
"@react-native-community/netinfo@^11.4.1":
version "11.4.1"
resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-11.4.1.tgz#a3c247aceab35f75dd0aa4bfa85d2be5a4508688"
integrity sha512-B0BYAkghz3Q2V09BF88RA601XursIEA111tnc2JOaN7axJWmNefmfjZqw/KdSxKZp7CZUuPpjBmz/WCR9uaHYg==

"@react-native-firebase/app@^20.3.0":
version "20.3.0"
Expand Down Expand Up @@ -3848,11 +3848,6 @@
"@babel/runtime" "^7.12.5"
react-error-boundary "^3.1.0"

"@th3rdwave/react-navigation-bottom-sheet@^0.3.2":
version "0.3.2"
resolved "https://registry.yarnpkg.com/@th3rdwave/react-navigation-bottom-sheet/-/react-navigation-bottom-sheet-0.3.2.tgz#b7999322d54cb8f9a2b1b39e6c47f482407c5250"
integrity sha512-DEqC9tlAWE8qw5DDveyTwG0qjMJH3h8nup5Qi3TBlfW8hG9qx0N1/dfA1D+GKFEb4gw1C2/AWC6umc13z7ytoQ==

"@th3rdwave/react-navigation-bottom-sheet@https://github.com/29ki/react-navigation-bottom-sheet.git#overlay-as-containerComponent":
version "0.3.2"
resolved "https://github.com/29ki/react-navigation-bottom-sheet.git#bb3a34d200f59bb1887803a2b8b5b6af5125e926"
Expand Down Expand Up @@ -9013,9 +9008,9 @@ [email protected]:
integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==

nanoid@^3.1.23, nanoid@^3.3.1, nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

natural-compare@^1.4.0:
version "1.4.0"
Expand Down Expand Up @@ -9543,10 +9538,10 @@ [email protected]:
picocolors "^1.0.0"
source-map-js "^1.2.0"

posthog-react-native@^3.3.9:
version "3.3.9"
resolved "https://registry.yarnpkg.com/posthog-react-native/-/posthog-react-native-3.3.9.tgz#bb551d3858430ca686a1b459f15bde20e9033948"
integrity sha512-Gb7Hc0HKMGc9T3bWXF1IfAOYkBlzIOKl71CVveEdNEzUkxvN3bfsq5CQ2TXNpzz31q2BMvfVEt0SIN9JQZCeKA==
posthog-react-native@^3.6.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/posthog-react-native/-/posthog-react-native-3.6.1.tgz#a0a7189761013fac3ef46582b5e3b279067ba7ca"
integrity sha512-IRGfLEranh+8nTvUsyw97XeqhGwi0ine/F6tMGrdT+RmlsRFA9eRYLwupkdCviRL9mMVugBY6J4v1R1MvBw+1w==

prelude-ls@^1.2.1:
version "1.2.1"
Expand Down Expand Up @@ -9893,10 +9888,10 @@ react-native-asset@^2.1.1:
sha1-file "^1.0.4"
xcode "^2.0.0"

react-native-awesome-slider@^2.5.6:
version "2.5.6"
resolved "https://registry.yarnpkg.com/react-native-awesome-slider/-/react-native-awesome-slider-2.5.6.tgz#29bb6f65f9262777797a70ef0c8ccde409ff8d1e"
integrity sha512-kPxxKBEi8B0DfZhDo9X9ZO5uo6DtyGRisPHCeO3juox4ptvKBvcUurb0SYSG6akSuMb95Ijv/LXGKSfIofAd1Q==
react-native-awesome-slider@^2.9.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/react-native-awesome-slider/-/react-native-awesome-slider-2.9.0.tgz#7d5013a0e0e15ed84d59b4fa4c26a8b7ab9b2454"
integrity sha512-sc5qgX4YtM6IxjtosjgQLdsal120MvU+YWs0F2MdgQWijps22AXLDCUoBnZZ8vxVhVyJ2WnnIPrmtVBvVJjSuQ==

react-native-background-timer@^2.3.1:
version "2.4.1"
Expand Down Expand Up @@ -9928,10 +9923,10 @@ react-native-code-push@^9.0.0:
semver "^7.3.5"
xcode "3.0.1"

react-native-device-info@^11.1.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-11.1.0.tgz#7db5c4e5a179dce761efac155a493aa0956a40ab"
integrity sha512-hzXJSObJdezEz0hF7MAJ3tGeoesuQWenXXt9mrQR9Mjb8kXpZ09rqSsZ/quNpJdZpQ3rYiFa3/0GFG5KNn9PBg==
react-native-device-info@^14.0.2:
version "14.0.2"
resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-14.0.2.tgz#cb583e283eba4e54f56c9c548dae89a96ccf39ab"
integrity sha512-W1oqu4dC4uLKT/Z4uimRP6birJprWjhMP/AwV9hxGSZ5K3wJ/yb34aQ22sd6HmegQHfT2PmkFs3mj+4uXLE1YQ==

react-native-dotenv@^3.4.11:
version "3.4.11"
Expand Down Expand Up @@ -9964,20 +9959,20 @@ react-native-get-random-values@^1.11.0:
dependencies:
fast-base64-decode "^1.0.0"

react-native-haptic-feedback@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/react-native-haptic-feedback/-/react-native-haptic-feedback-2.2.0.tgz#bc46edd1f053265bfbe6c32487cbce074e099429"
integrity sha512-3tqJOjCguWhIrX0nkURn4yw6kXdsSDjjrvZCRjKXYGlL28hdQmoW2okAHduDTD9FWj9lA+lHgwFWgGs4aFNN7A==
react-native-haptic-feedback@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/react-native-haptic-feedback/-/react-native-haptic-feedback-2.3.3.tgz#88b6876e91399a69bd1b551fe1681b2f3dc1214e"
integrity sha512-svS4D5PxfNv8o68m9ahWfwje5NqukM3qLS48+WTdhbDkNUkOhP9rDfDSRHzlhk4zq+ISjyw95EhLeh8NkKX5vQ==

react-native-idle-timer@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/react-native-idle-timer/-/react-native-idle-timer-2.2.3.tgz#88304ea562b06e730048dc6b84910e900247294a"
integrity sha512-psqoUJDHmFkl5o3ublqLI6eiYFiM/o1O7TLeHjW8Fmx/wVXKESoVaWKIP01QqkoUnHqqch3GmBThkDx8plBnVA==

react-native-image-crop-picker@^0.41.2:
version "0.41.2"
resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.41.2.tgz#824fa8fee8391fbb3e0b5ae2973221a2dff0cafb"
integrity sha512-GcDu/adXU/1y/MrxsbOfqcGRGWC2pTttt5VGy/jyRJ6GXfoC29fTQf8SG5kGtc5schSR6K+mKYO4uW6eJPljlQ==
react-native-image-crop-picker@^0.41.6:
version "0.41.6"
resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.41.6.tgz#de2c00102f4c934848fa11ff2335f29f5dc6b3e3"
integrity sha512-oyEVkiJX1cnjYJolQluOqXxz9xhLHrv+pyCs7+jA87yaa110/0jv1UCqxjVjxueKug7zk/UnjG7i9Ks1cGyLpA==

react-native-linear-gradient@^2.8.3:
version "2.8.3"
Expand Down Expand Up @@ -10026,15 +10021,15 @@ react-native-reanimated@^3.16.4:
convert-source-map "^2.0.0"
invariant "^2.2.4"

react-native-safe-area-context@^4.10.9:
version "4.10.9"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.10.9.tgz#6ab82dc866ab499b101b033cb0f5b40125a4d410"
integrity sha512-wz/JXV1kARWyP5q93PFNKQP03StVBimOK7rRYEJjM+blZdXbM6H7EP3XhQUb6OK620+0M1AzpcGgyTHvgSJNAw==
react-native-safe-area-context@^4.14.0:
version "4.14.0"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.14.0.tgz#138f4b2e180cb7517c78bd5f4d4cf91325ba0b1a"
integrity sha512-/SyYpCulWQOnnXhRq6wepkhoyQMowHm1ptDyRz20s+YS/R9mbd+mK+jFyFCyXFJn8jp7vFl43VUCgspuOiEbwA==

react-native-screens@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.3.0.tgz#c4fef7583535c963e9257cdd1d91a9889961ab61"
integrity sha512-G0u8BPgu2vcRZoQTlRpBXKa0ElQSDvDBlRe6ncWwCeBmd5Uqa2I3tQ6Vn6trIE6+yneW/nD4p5wihEHlAWZPEw==
react-native-screens@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-4.4.0.tgz#3fcbcdf1bbb1be2736b10d43edc3d4e69c37b5aa"
integrity sha512-c7zc7Zwjty6/pGyuuvh9gK3YBYqHPOxrhXfG1lF4gHlojQSmIx2piNbNaV+Uykj+RDTmFXK0e/hA+fucw/Qozg==
dependencies:
react-freeze "^1.0.0"
warn-once "^0.1.0"
Expand Down Expand Up @@ -12079,10 +12074,10 @@ yocto-queue@^0.1.0:
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

yup@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/yup/-/yup-1.4.0.tgz#898dcd660f9fb97c41f181839d3d65c3ee15a43e"
integrity sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==
yup@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/yup/-/yup-1.6.1.tgz#8defcff9daaf9feac178029c0e13b616563ada4b"
integrity sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA==
dependencies:
property-expr "^2.0.5"
tiny-case "^1.0.3"
Expand Down
12 changes: 6 additions & 6 deletions cms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
"dayjs": "^1.11.13",
"decap-cms-app": "3.4.0",
"decap-cms-media-library-cloudinary": "^3.0.3",
"i18next": "^24.0.2",
"react-native-safe-area-context": "^4.14.0",
"i18next": "^24.2.0",
"react-native-safe-area-context": "^5.0.0",
"react-native-svg": "15.4.0",
"react-native-web": "^0.19.13",
"styled-components": "^6.1.13"
},
"devDependencies": {
"@types/jest": "^29.5.14",
"@types/node": "^22.10.1",
"@types/node": "^22.10.2",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react-native-web": "^0.19.0",
Expand All @@ -44,10 +44,10 @@
"eslint-plugin-prettier": "^5.2.1",
"jest": "^29.7.0",
"netlify-ts": "^2.0.0",
"prettier": "^3.4.1",
"prettier": "^3.4.2",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": "^5.6.3",
"vite": "^5.4.10"
"typescript": "^5.7.2",
"vite": "^6.0.6"
}
}
Loading

0 comments on commit 2d5f294

Please sign in to comment.