From 636e4566c0cb6c962ef9c4a727bac75d4c60bcd4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:35:16 +0000 Subject: [PATCH 01/28] Bump @react-native-community/netinfo from 11.3.2 to 11.4.1 in /client Bumps [@react-native-community/netinfo](https://github.com/react-native-netinfo/react-native-netinfo) from 11.3.2 to 11.4.1. - [Release notes](https://github.com/react-native-netinfo/react-native-netinfo/releases) - [Changelog](https://github.com/react-native-netinfo/react-native-netinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-netinfo/react-native-netinfo/compare/v11.3.2...v11.4.1) --- updated-dependencies: - dependency-name: "@react-native-community/netinfo" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 8f11b8f7fe..461e56ccf3 100644 --- a/client/package.json +++ b/client/package.json @@ -30,7 +30,7 @@ "@notifee/react-native": "^9.1.1", "@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", diff --git a/client/yarn.lock b/client/yarn.lock index ae48b66b9a..6676b45a9a 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -3614,10 +3614,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" From 6c7fd29ec7fb9ad8d5eae2250a56f2376d1eab34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:35:48 +0000 Subject: [PATCH 02/28] Bump react-native-haptic-feedback from 2.2.0 to 2.3.3 in /client Bumps [react-native-haptic-feedback](https://github.com/mkuczera/react-native-haptic-feedback) from 2.2.0 to 2.3.3. - [Release notes](https://github.com/mkuczera/react-native-haptic-feedback/releases) - [Commits](https://github.com/mkuczera/react-native-haptic-feedback/compare/v2.2.0...v2.3.3) --- updated-dependencies: - dependency-name: react-native-haptic-feedback dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 8f11b8f7fe..87679914ff 100644 --- a/client/package.json +++ b/client/package.json @@ -69,7 +69,7 @@ "react-native-device-info": "^11.1.0", "react-native-gesture-handler": "^2.20.0", "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-linear-gradient": "^2.8.3", diff --git a/client/yarn.lock b/client/yarn.lock index ae48b66b9a..ab5a25e471 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -10543,10 +10543,10 @@ 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" From 584d1fd83b3a519c95757b5c98ad393fb50d8055 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 19:42:36 +0000 Subject: [PATCH 03/28] Bump react-native-safe-area-context from 4.10.9 to 4.14.0 in /client Bumps [react-native-safe-area-context](https://github.com/th3rdwave/react-native-safe-area-context) from 4.10.9 to 4.14.0. - [Release notes](https://github.com/th3rdwave/react-native-safe-area-context/releases) - [Commits](https://github.com/th3rdwave/react-native-safe-area-context/compare/v4.10.9...v4.14.0) --- updated-dependencies: - dependency-name: react-native-safe-area-context dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 1bf43a2dbd..c8daac50c0 100644 --- a/client/package.json +++ b/client/package.json @@ -78,7 +78,7 @@ "react-native-permissions": "^4.1.5", "react-native-rate": "^1.2.12", "react-native-reanimated": "^3.15.4", - "react-native-safe-area-context": "^4.10.9", + "react-native-safe-area-context": "^4.14.0", "react-native-screens": "^3.34.0", "react-native-svg": "^15.8.0", "react-native-volume-manager": "^1.10.0", diff --git a/client/yarn.lock b/client/yarn.lock index 3a03efd587..e701d4f3f6 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -10170,10 +10170,10 @@ react-native-reanimated@^3.15.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@^3.34.0: version "3.34.0" From 4472b8a3bb8b0ba41a8be16babdc926fd6954857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:38:17 +0000 Subject: [PATCH 04/28] Bump react-native-image-crop-picker from 0.41.2 to 0.41.6 in /client Bumps [react-native-image-crop-picker](https://github.com/ivpusic/react-native-image-crop-picker) from 0.41.2 to 0.41.6. - [Release notes](https://github.com/ivpusic/react-native-image-crop-picker/releases) - [Commits](https://github.com/ivpusic/react-native-image-crop-picker/compare/v0.41.2...v0.41.6) --- updated-dependencies: - dependency-name: react-native-image-crop-picker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 1bf43a2dbd..61d5b90020 100644 --- a/client/package.json +++ b/client/package.json @@ -71,7 +71,7 @@ "react-native-get-random-values": "^1.11.0", "react-native-haptic-feedback": "^2.2.0", "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", diff --git a/client/yarn.lock b/client/yarn.lock index 3a03efd587..203744d102 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -10118,10 +10118,10 @@ react-native-idle-timer@^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" From e5b24e155cd27f9ee365a1a6cf4bcb780a02dd2d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 14:39:00 +0000 Subject: [PATCH 05/28] Bump @notifee/react-native from 9.1.1 to 9.1.3 in /client Bumps [@notifee/react-native](https://github.com/invertase/notifee) from 9.1.1 to 9.1.3. - [Release notes](https://github.com/invertase/notifee/releases) - [Commits](https://github.com/invertase/notifee/compare/@notifee/react-native@9.1.1...@notifee/react-native9.1.3) --- updated-dependencies: - dependency-name: "@notifee/react-native" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 1bf43a2dbd..c6ef4b9a18 100644 --- a/client/package.json +++ b/client/package.json @@ -27,7 +27,7 @@ "@gorhom/bottom-sheet": "^4.6.4", "@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", diff --git a/client/yarn.lock b/client/yarn.lock index 3a03efd587..940ef6f4ff 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2757,10 +2757,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" From 395ce2447e6c3d16030a4e64c1e16f2ba5b6ee1b Mon Sep 17 00:00:00 2001 From: gewfy Date: Sat, 7 Dec 2024 12:23:34 +0100 Subject: [PATCH 06/28] Bump version name --- client/android/app/build.gradle | 2 +- client/ios/twentyninek.xcodeproj/project.pbxproj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle index 7f42aaf26f..28a033963c 100644 --- a/client/android/app/build.gradle +++ b/client/android/app/build.gradle @@ -82,7 +82,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 211 - versionName "2.58.0" + versionName "2.59.0" } signingConfigs { debug { diff --git a/client/ios/twentyninek.xcodeproj/project.pbxproj b/client/ios/twentyninek.xcodeproj/project.pbxproj index cb6d5a0ac2..071e360c0b 100644 --- a/client/ios/twentyninek.xcodeproj/project.pbxproj +++ b/client/ios/twentyninek.xcodeproj/project.pbxproj @@ -1050,7 +1050,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -1083,7 +1083,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -1116,7 +1116,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -1149,7 +1149,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", @@ -1183,7 +1183,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -1216,7 +1216,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.58.0; + MARKETING_VERSION = 2.59.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "$(inherited)", From a03cd814da87d21a86ab9f9098ad6ed7979c3ed2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:08:05 +0000 Subject: [PATCH 07/28] Bump @react-native-community/netinfo from 11.3.2 to 11.4.1 in /client Bumps [@react-native-community/netinfo](https://github.com/react-native-netinfo/react-native-netinfo) from 11.3.2 to 11.4.1. - [Release notes](https://github.com/react-native-netinfo/react-native-netinfo/releases) - [Changelog](https://github.com/react-native-netinfo/react-native-netinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-netinfo/react-native-netinfo/compare/v11.3.2...v11.4.1) --- updated-dependencies: - dependency-name: "@react-native-community/netinfo" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 6862f9b950..34ed1a83c2 100644 --- a/client/package.json +++ b/client/package.json @@ -30,7 +30,7 @@ "@notifee/react-native": "^9.1.1", "@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", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..32a049f977 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -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" From f3b382a4c4ea66b57f7f19dc68a6c3bad59389bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 13:08:21 +0000 Subject: [PATCH 08/28] Bump react-native-image-crop-picker from 0.41.2 to 0.41.6 in /client Bumps [react-native-image-crop-picker](https://github.com/ivpusic/react-native-image-crop-picker) from 0.41.2 to 0.41.6. - [Release notes](https://github.com/ivpusic/react-native-image-crop-picker/releases) - [Commits](https://github.com/ivpusic/react-native-image-crop-picker/compare/v0.41.2...v0.41.6) --- updated-dependencies: - dependency-name: react-native-image-crop-picker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 6862f9b950..08449fe78f 100644 --- a/client/package.json +++ b/client/package.json @@ -71,7 +71,7 @@ "react-native-get-random-values": "^1.11.0", "react-native-haptic-feedback": "^2.2.0", "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", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..94e4ce463a 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9970,10 +9970,10 @@ react-native-idle-timer@^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" From ef2c2ab2e36dba3815dd8b93d93db23eedad2f52 Mon Sep 17 00:00:00 2001 From: gewfy Date: Mon, 9 Dec 2024 21:22:15 +0100 Subject: [PATCH 09/28] Remove right-to-left rendering support --- .../main/java/org/twentyninek/app/cupcake/MainApplication.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/android/app/src/main/java/org/twentyninek/app/cupcake/MainApplication.kt b/client/android/app/src/main/java/org/twentyninek/app/cupcake/MainApplication.kt index c8130c9cba..009f4a73dd 100644 --- a/client/android/app/src/main/java/org/twentyninek/app/cupcake/MainApplication.kt +++ b/client/android/app/src/main/java/org/twentyninek/app/cupcake/MainApplication.kt @@ -15,6 +15,8 @@ import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost import com.facebook.react.defaults.DefaultReactNativeHost import com.facebook.soloader.SoLoader +import com.facebook.react.modules.i18nmanager.I18nUtil; + class MainApplication : Application(), ReactApplication { override val reactNativeHost: ReactNativeHost = @@ -41,6 +43,9 @@ class MainApplication : Application(), ReactApplication { override fun onCreate() { super.onCreate() + // Do not support right-to-left layouting + val sharedI18nUtilInstance = I18nUtil.getInstance() + sharedI18nUtilInstance.allowRTL(applicationContext, false) SoLoader.init(this, false) if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. From ca18899b74689a476d5ac722985f4630f001f242 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:44:56 +0000 Subject: [PATCH 10/28] Bump react-native-screens from 3.34.0 to 4.4.0 in /client Bumps [react-native-screens](https://github.com/software-mansion/react-native-screens) from 3.34.0 to 4.4.0. - [Release notes](https://github.com/software-mansion/react-native-screens/releases) - [Commits](https://github.com/software-mansion/react-native-screens/compare/3.34.0...4.4.0) --- updated-dependencies: - dependency-name: react-native-screens dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 6862f9b950..7afad8c361 100644 --- a/client/package.json +++ b/client/package.json @@ -79,7 +79,7 @@ "react-native-rate": "^1.2.12", "react-native-reanimated": "^3.15.4", "react-native-safe-area-context": "^4.10.9", - "react-native-screens": "^3.34.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", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..99df57b56b 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -10027,10 +10027,10 @@ react-native-safe-area-context@^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-screens@^3.34.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.34.0.tgz#1291a460c5bc59e2ba581b42d40fa9a58d3b1197" - integrity sha512-8ri3Pd9QcpfXnVckOe/Lnto+BXmSPHV/Q0RB0XW0gDKsCv5wi5k7ez7g1SzgiYHl29MSdiqgjH30zUyOOowOaw== +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" From 3f11dee0ae49f68124d371f5dfa6940cbb5f9490 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:46:39 +0000 Subject: [PATCH 11/28] Bump react-native-device-info from 11.1.0 to 14.0.2 in /client Bumps [react-native-device-info](https://github.com/react-native-device-info/react-native-device-info) from 11.1.0 to 14.0.2. - [Release notes](https://github.com/react-native-device-info/react-native-device-info/releases) - [Changelog](https://github.com/react-native-device-info/react-native-device-info/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-native-device-info/react-native-device-info/compare/v11.1.0...v14.0.2) --- updated-dependencies: - dependency-name: react-native-device-info dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 6862f9b950..46f294de61 100644 --- a/client/package.json +++ b/client/package.json @@ -66,7 +66,7 @@ "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.20.0", "react-native-get-random-values": "^1.11.0", "react-native-haptic-feedback": "^2.2.0", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..d68be5b7cf 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9924,10 +9924,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" From 4d957d10064fbd1600e56f39c6061d5fd1743e41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:48:35 +0000 Subject: [PATCH 12/28] Bump posthog-react-native from 3.3.9 to 3.6.1 in /client Bumps [posthog-react-native](https://github.com/PostHog/posthog-js-lite/tree/HEAD/posthog-react-native) from 3.3.9 to 3.6.1. - [Release notes](https://github.com/PostHog/posthog-js-lite/releases) - [Changelog](https://github.com/PostHog/posthog-js-lite/blob/main/posthog-react-native/CHANGELOG.md) - [Commits](https://github.com/PostHog/posthog-js-lite/commits/posthog-react-native-v3.6.1/posthog-react-native) --- updated-dependencies: - dependency-name: posthog-react-native dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 6862f9b950..26446dcc80 100644 --- a/client/package.json +++ b/client/package.json @@ -54,7 +54,7 @@ "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", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..2b9830fac0 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9539,10 +9539,10 @@ postcss@8.4.38: 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" From 61b665771555df0e4d95acd466f53059d1ded24c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:26:18 +0000 Subject: [PATCH 13/28] Bump react-native-safe-area-context from 4.14.0 to 5.0.0 in /web Bumps [react-native-safe-area-context](https://github.com/th3rdwave/react-native-safe-area-context) from 4.14.0 to 5.0.0. - [Release notes](https://github.com/th3rdwave/react-native-safe-area-context/releases) - [Commits](https://github.com/th3rdwave/react-native-safe-area-context/compare/v4.14.0...v5.0.0) --- updated-dependencies: - dependency-name: react-native-safe-area-context dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- web/package.json | 2 +- web/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/package.json b/web/package.json index 1b20de5ff6..947326e8e5 100644 --- a/web/package.json +++ b/web/package.json @@ -19,7 +19,7 @@ "react": "^18", "react-dom": "^18", "react-i18next": "^15.4.0", - "react-native-safe-area-context": "^4.14.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" diff --git a/web/yarn.lock b/web/yarn.lock index f37d854786..bdd76f494d 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -5214,10 +5214,10 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -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-safe-area-context@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.0.0.tgz#0f28f3b406d4466c6afdaaa615198d12741e88b5" + integrity sha512-4K4TvEbRsTDYuSSJZfMNKuJNn1+qgrSkOBwRoreiHcuqy1egrHpkhPhoN1Zg1+b3BxcVXlKXtMIf4eVaG/DPJw== react-native-svg@15.4.0: version "15.4.0" From 5998ac0a04696289b1c5d48e81b1face54e96005 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:27:58 +0000 Subject: [PATCH 14/28] Bump react-native-safe-area-context from 4.14.0 to 5.0.0 in /cms Bumps [react-native-safe-area-context](https://github.com/th3rdwave/react-native-safe-area-context) from 4.14.0 to 5.0.0. - [Release notes](https://github.com/th3rdwave/react-native-safe-area-context/releases) - [Commits](https://github.com/th3rdwave/react-native-safe-area-context/compare/v4.14.0...v5.0.0) --- updated-dependencies: - dependency-name: react-native-safe-area-context dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- cms/package.json | 2 +- cms/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/package.json b/cms/package.json index 7ba9b1405b..173ad96fc2 100644 --- a/cms/package.json +++ b/cms/package.json @@ -22,7 +22,7 @@ "decap-cms-app": "3.4.0", "decap-cms-media-library-cloudinary": "^3.0.3", "i18next": "^24.2.0", - "react-native-safe-area-context": "^4.14.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" diff --git a/cms/yarn.lock b/cms/yarn.lock index 87f3135e54..c6343d56d4 100644 --- a/cms/yarn.lock +++ b/cms/yarn.lock @@ -8455,10 +8455,10 @@ react-modal@^3.8.1: react-lifecycles-compat "^3.0.0" warning "^4.0.3" -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-safe-area-context@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.0.0.tgz#0f28f3b406d4466c6afdaaa615198d12741e88b5" + integrity sha512-4K4TvEbRsTDYuSSJZfMNKuJNn1+qgrSkOBwRoreiHcuqy1egrHpkhPhoN1Zg1+b3BxcVXlKXtMIf4eVaG/DPJw== react-native-svg@15.4.0: version "15.4.0" From 233855463026be9169e9fcb6991acf2dd9d7ece4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:34:18 +0000 Subject: [PATCH 15/28] Bump react-native-safe-area-context from 4.14.0 to 5.0.0 in /web Bumps [react-native-safe-area-context](https://github.com/th3rdwave/react-native-safe-area-context) from 4.14.0 to 5.0.0. - [Release notes](https://github.com/th3rdwave/react-native-safe-area-context/releases) - [Commits](https://github.com/th3rdwave/react-native-safe-area-context/compare/v4.14.0...v5.0.0) --- updated-dependencies: - dependency-name: react-native-safe-area-context dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- web/package.json | 2 +- web/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/package.json b/web/package.json index 1b20de5ff6..947326e8e5 100644 --- a/web/package.json +++ b/web/package.json @@ -19,7 +19,7 @@ "react": "^18", "react-dom": "^18", "react-i18next": "^15.4.0", - "react-native-safe-area-context": "^4.14.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" diff --git a/web/yarn.lock b/web/yarn.lock index 16db51ea16..b0f8b213e1 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -5214,10 +5214,10 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -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-safe-area-context@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.0.0.tgz#0f28f3b406d4466c6afdaaa615198d12741e88b5" + integrity sha512-4K4TvEbRsTDYuSSJZfMNKuJNn1+qgrSkOBwRoreiHcuqy1egrHpkhPhoN1Zg1+b3BxcVXlKXtMIf4eVaG/DPJw== react-native-svg@15.4.0: version "15.4.0" From c73117e29a65af3883d6f207c19ac8bf3f91be59 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:41:28 +0000 Subject: [PATCH 16/28] Bump react-native-safe-area-context from 4.14.0 to 5.0.0 in /cms Bumps [react-native-safe-area-context](https://github.com/th3rdwave/react-native-safe-area-context) from 4.14.0 to 5.0.0. - [Release notes](https://github.com/th3rdwave/react-native-safe-area-context/releases) - [Commits](https://github.com/th3rdwave/react-native-safe-area-context/compare/v4.14.0...v5.0.0) --- updated-dependencies: - dependency-name: react-native-safe-area-context dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- cms/package.json | 2 +- cms/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/package.json b/cms/package.json index 27c47c3f5d..a4a1912edf 100644 --- a/cms/package.json +++ b/cms/package.json @@ -22,7 +22,7 @@ "decap-cms-app": "3.4.0", "decap-cms-media-library-cloudinary": "^3.0.3", "i18next": "^24.2.0", - "react-native-safe-area-context": "^4.14.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" diff --git a/cms/yarn.lock b/cms/yarn.lock index c3f56a5a72..bbfcd64758 100644 --- a/cms/yarn.lock +++ b/cms/yarn.lock @@ -8455,10 +8455,10 @@ react-modal@^3.8.1: react-lifecycles-compat "^3.0.0" warning "^4.0.3" -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-safe-area-context@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.0.0.tgz#0f28f3b406d4466c6afdaaa615198d12741e88b5" + integrity sha512-4K4TvEbRsTDYuSSJZfMNKuJNn1+qgrSkOBwRoreiHcuqy1egrHpkhPhoN1Zg1+b3BxcVXlKXtMIf4eVaG/DPJw== react-native-svg@15.4.0: version "15.4.0" From 4af8c8b9e03d7fc226eaf314a2b7e5b2e0f7f645 Mon Sep 17 00:00:00 2001 From: gewfy Date: Wed, 1 Jan 2025 16:41:59 +0100 Subject: [PATCH 17/28] Bump dependencies: update RNGestureHandler to 2.21.2, RNReanimated to 3.16.4, and RNScreens to 4.3.0; adjust metro config for Reanimated --- client/ios/Podfile.lock | 44 ++++++++++++++++++++++++++++++----------- client/metro.config.js | 7 ++++++- client/package.json | 10 +++++----- client/yarn.lock | 36 ++++++++++++++++++--------------- 4 files changed, 64 insertions(+), 33 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 827c20849e..d8462a938b 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -2391,7 +2391,7 @@ PODS: - Firebase/Storage (= 10.29.0) - React-Core - RNFBApp - - RNGestureHandler (2.20.0): + - RNGestureHandler (2.21.2): - DoubleConversion - glog - hermes-engine @@ -2434,7 +2434,7 @@ PODS: - React-Core - RNReactNativeHapticFeedback (2.2.0): - React-Core - - RNReanimated (3.15.4): + - RNReanimated (3.16.4): - DoubleConversion - glog - hermes-engine @@ -2454,10 +2454,10 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - RNReanimated/reanimated (= 3.15.4) - - RNReanimated/worklets (= 3.15.4) + - RNReanimated/reanimated (= 3.16.4) + - RNReanimated/worklets (= 3.16.4) - Yoga - - RNReanimated/reanimated (3.15.4): + - RNReanimated/reanimated (3.16.4): - DoubleConversion - glog - hermes-engine @@ -2477,8 +2477,9 @@ PODS: - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core + - RNReanimated/reanimated/apple (= 3.16.4) - Yoga - - RNReanimated/worklets (3.15.4): + - RNReanimated/reanimated/apple (3.16.4): - DoubleConversion - glog - hermes-engine @@ -2499,7 +2500,28 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - RNScreens (3.34.0): + - RNReanimated/worklets (3.16.4): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen + - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga + - RNScreens (4.3.0): - DoubleConversion - glog - hermes-engine @@ -3013,15 +3035,15 @@ SPEC CHECKSUMS: RNFBDynamicLinks: 6e5d52576c079e65040110c8a9b895c6e1f02edc RNFBFirestore: 9b5e7d645787f02d5d16c4e060e778e9da762e02 RNFBStorage: a86f59a4adae00b3061e55257d6c3d70851a1810 - RNGestureHandler: 83fd202dbc0b8971414c5c7c56ddd9f5cde05911 + RNGestureHandler: 38b7949a58a56ae0e2a3c38920cb6852cafb6b9f RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc RNNotifee: 35b5f984d11083b02d7f2990b3408cd99a0aeeac RNPermissions: a58e61bd4e6bd417adcf8ef8ca094b93d772e492 RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9 - RNReanimated: 4e3738c07d997c502b5fa407524700dfa8712777 - RNScreens: db442e7b8c7bc8befec2ce057927305ff8598cc8 + RNReanimated: 13f9f061449dd7a1f6e1b8fb4caf18b880b41bd1 + RNScreens: d090bfb033bb48f8da0983999ea58868e813cb80 RNSentry: d2f4b8dc672fb4e26b50b99e006e52d547e36b3f RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57 @@ -3037,7 +3059,7 @@ SPEC CHECKSUMS: StripePaymentsUI: 7d7cffb2ecfc0d6b5ac3a4488c02893a5ff6cc77 StripeUICore: bb102d453b1e1a10a37f810bc0a9aa0675fb17fd TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - Yoga: eed50599a85bd9f6882a9938d118aed6a397db9c + Yoga: bd92064a0d558be92786820514d74fc4dddd1233 PODFILE CHECKSUM: 1e2c5c3ea8152bd7472ee44e381909c2f6afd170 diff --git a/client/metro.config.js b/client/metro.config.js index b3212adade..2c9eb38828 100644 --- a/client/metro.config.js +++ b/client/metro.config.js @@ -1,3 +1,6 @@ +const { + wrapWithReanimatedMetroConfig, +} = require('react-native-reanimated/metro-config'); const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config'); /** * Metro configuration for React Native @@ -60,4 +63,6 @@ const config = { }, }; -module.exports = mergeConfig(getDefaultConfig(__dirname), config); +module.exports = wrapWithReanimatedMetroConfig( + mergeConfig(getDefaultConfig(__dirname), config), +); diff --git a/client/package.json b/client/package.json index 6862f9b950..2a806903e7 100644 --- a/client/package.json +++ b/client/package.json @@ -24,7 +24,7 @@ "@daily-co/react-native-daily-js": "0.69.0", "@daily-co/react-native-webrtc": "118.0.3-daily.1", "@dotlottie/react-player": "^1.6.19", - "@gorhom/bottom-sheet": "^4.6.4", + "@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", @@ -44,7 +44,7 @@ "@react-navigation/stack": "^6.4.1", "@sentry/react-native": "^5.33.1", "@stripe/stripe-react-native": "^0.39.0", - "@th3rdwave/react-navigation-bottom-sheet": "^0.3.2", + "@th3rdwave/react-navigation-bottom-sheet": "https://github.com/29ki/react-navigation-bottom-sheet.git#overlay-as-containerComponent", "@types/lodash.throttle": "^4.1.9", "dayjs": "^1.11.13", "debug": "^4.3.6", @@ -67,7 +67,7 @@ "react-native-circular-progress": "^1.4.1", "react-native-code-push": "^9.0.0", "react-native-device-info": "^11.1.0", - "react-native-gesture-handler": "^2.20.0", + "react-native-gesture-handler": "^2.21.2", "react-native-get-random-values": "^1.11.0", "react-native-haptic-feedback": "^2.2.0", "react-native-idle-timer": "^2.2.3", @@ -77,9 +77,9 @@ "react-native-markdown-display": "^7.0.2", "react-native-permissions": "^4.1.5", "react-native-rate": "^1.2.12", - "react-native-reanimated": "^3.15.4", + "react-native-reanimated": "^3.16.4", "react-native-safe-area-context": "^4.10.9", - "react-native-screens": "^3.34.0", + "react-native-screens": "^4.3.0", "react-native-svg": "^15.8.0", "react-native-volume-manager": "^1.10.0", "react-native-web": "^0.19.13", diff --git a/client/yarn.lock b/client/yarn.lock index 72338d2268..9bae998f1d 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2069,10 +2069,10 @@ resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-1.0.0.tgz#a0e11b39fa3ef56ed5333bf321f581037aeda033" integrity sha512-zuWxyfXNbsKbm96HhXzainONPFqRcoZblQ++e9cAIGUuHfl2cFSBzW01jtesqWG/lqaUyX3H8O1y9oWboGNQBA== -"@gorhom/bottom-sheet@^4.6.4": - version "4.6.4" - resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-4.6.4.tgz#387d0f0f21e3470eb8575498cb81ce96f5108e79" - integrity sha512-0itLMblLBvepE065w3a60S030c2rNUsGshPC7wbWDm31VyqoaU2xjzh/ojH62YIJOcobBr5QoC30IxBBKDGovQ== +"@gorhom/bottom-sheet@^5.0.6": + version "5.0.6" + resolved "https://registry.yarnpkg.com/@gorhom/bottom-sheet/-/bottom-sheet-5.0.6.tgz#f20736502399c7bcf8c73ea09e6b571dc07fe0eb" + integrity sha512-SI/AhPvgRfnCWN6/+wbE6TXwRE4X8F2fLyE4L/0bRwgE34Zenq585qLT139uEcfCIyovC2swC3ICqQpkmWEcFA== dependencies: "@gorhom/portal" "1.0.14" invariant "^2.2.4" @@ -3853,6 +3853,10 @@ 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" + "@tootallnate/quickjs-emscripten@^0.23.0": version "0.23.0" resolved "https://registry.yarnpkg.com/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz#db4ecfd499a9765ab24002c3b696d02e6d32a12c" @@ -9943,10 +9947,10 @@ react-native-fit-image@^1.5.5: dependencies: prop-types "^15.5.10" -react-native-gesture-handler@^2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.20.0.tgz#2d9ec4e9bd22619ebe36269dda3ecb1173928276" - integrity sha512-rFKqgHRfxQ7uSAivk8vxCiW4SB3G0U7jnv7kZD4Y90K5kp6YrU8Q3tWhxe3Rx55BIvSd3mBe9ZWbWVJ0FsSHPA== +react-native-gesture-handler@^2.21.2: + version "2.21.2" + resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-2.21.2.tgz#824a098d7397212fbe51aa3a9df84833a4ea1c3f" + integrity sha512-HcwB225K9aeZ8e/B8nFzEh+2T4EPWTeamO1l/y3PcQ9cyCDYO2zja/G31ITpYRIqkip7XzGs6wI/gnHOQn1LDQ== dependencies: "@egjs/hammerjs" "^2.0.17" hoist-non-react-statics "^3.3.0" @@ -10005,10 +10009,10 @@ react-native-rate@^1.2.12: resolved "https://registry.yarnpkg.com/react-native-rate/-/react-native-rate-1.2.12.tgz#d4307b2994f9c849b987eb65599ec467db4aee04" integrity sha512-A/z3s7Zth08aXcJnru6S4p71NG8acx2w5LhIfItwTJUbQruNJugk8WrN51dLBCSDv8W33kbS5YoUT4M9jOP5gA== -react-native-reanimated@^3.15.4: - version "3.15.4" - resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.15.4.tgz#0d4aa65b53f9c845fe8c33aa8a3ad3d06a23f063" - integrity sha512-jcpHE+MnsvSbClhHgAFoken7SnaHrUJ5gVA8BUw8S1j6rkrw2VzRpht6cxn14NlqYx5ytjfG9IXJDOzq8tFvfw== +react-native-reanimated@^3.16.4: + version "3.16.4" + resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.16.4.tgz#bb5798366aa6c4db6f53ae8a3b1d7bd6d6d903eb" + integrity sha512-dF1Vvu8gG+p0+DmBhKMTx5X9iw/rH1ZF9WaIn2nW0c5rxsVFf00axmDgaAdPxNWblmtLnroaKwrV7SjMUyOx+g== dependencies: "@babel/plugin-transform-arrow-functions" "^7.0.0-0" "@babel/plugin-transform-class-properties" "^7.0.0-0" @@ -10027,10 +10031,10 @@ react-native-safe-area-context@^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-screens@^3.34.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-3.34.0.tgz#1291a460c5bc59e2ba581b42d40fa9a58d3b1197" - integrity sha512-8ri3Pd9QcpfXnVckOe/Lnto+BXmSPHV/Q0RB0XW0gDKsCv5wi5k7ez7g1SzgiYHl29MSdiqgjH30zUyOOowOaw== +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== dependencies: react-freeze "^1.0.0" warn-once "^0.1.0" From f5d556d020ac4791e384bac27b947a5bca9254c5 Mon Sep 17 00:00:00 2001 From: gewfy Date: Wed, 1 Jan 2025 16:42:29 +0100 Subject: [PATCH 18/28] Make use of the patched containerComponent prop --- client/src/lib/navigation/ModalStack.tsx | 44 +++++++++++++++++------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/client/src/lib/navigation/ModalStack.tsx b/client/src/lib/navigation/ModalStack.tsx index a9080ce6c6..5b61931f02 100644 --- a/client/src/lib/navigation/ModalStack.tsx +++ b/client/src/lib/navigation/ModalStack.tsx @@ -1,4 +1,6 @@ import React, {useMemo} from 'react'; +import {StyleSheet} from 'react-native'; + import { BottomSheetNavigationOptions, createBottomSheetNavigator, @@ -14,7 +16,10 @@ import SessionErrorModal from '../../routes/modals/SessionErrorModal/SessionErro import {COLORS} from '../../../../shared/src/constants/colors'; import SETTINGS from '../constants/settings'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; -import {BottomSheetBackdrop} from '@gorhom/bottom-sheet'; +import { + BottomSheetBackdrop, + BottomSheetBackdropProps, +} from '@gorhom/bottom-sheet'; import ChangeLanguageModal from '../../routes/modals/ChangeLanguageModal/ChangeLanguageModal'; import ProfileSettingsModal from '../../routes/modals/ProfileSettingsModal/ProfileSettingsModal'; import SignInModal from '../../routes/modals/SignInModal/SignInModal'; @@ -46,22 +51,34 @@ import SessionModal from '../../routes/modals/SessionModal/SessionModal'; import FeedbackPostModal from '../../routes/modals/FeedbackPostModal/FeedbackPostModal'; import LiveSessionsModal from '../../routes/modals/LiveSessionsModal/LiveSessionsModal'; import UnlockCollectionModal from '../../routes/modals/UnlockCollectionModal/UnlockCollectionModal'; +import styled from 'styled-components/native'; const {Navigator, Screen, Group} = createBottomSheetNavigator(); +const ContainerComponent = styled.View.attrs({ + pointerEvents: 'box-none', +})({...StyleSheet.absoluteFillObject}); + +const BackdropComponent = ({ + animatedIndex, + animatedPosition, + style, +}: BottomSheetBackdropProps) => ( + +); + const modalScreenOptions: BottomSheetNavigationOptions = { - backdropComponent: ({animatedIndex, animatedPosition, style}) => ( - - ), + containerComponent: ContainerComponent, + backdropComponent: BackdropComponent, backgroundStyle: { backgroundColor: 'transparent', shadowColor: '#000000', @@ -80,12 +97,13 @@ const modalScreenOptions: BottomSheetNavigationOptions = { left: 0, right: 0, }, + enableDynamicSizing: false, /* TODO: Fixes issues with modals being clipped when focusing on input fields https://github.com/gorhom/react-native-bottom-sheet/issues/618 */ android_keyboardInputMode: 'adjustResize', - stackBehavior: 'replace', + stackBehavior: 'push', }; const ModalStack = () => { From d302a9b43ea9b77ead16a0564c9db07e72d1a793 Mon Sep 17 00:00:00 2001 From: gewfy Date: Wed, 1 Jan 2025 16:48:11 +0100 Subject: [PATCH 19/28] Remove useHideModalUntilResolved --- .../components/ProfileInfo/ProfileInfo.tsx | 5 +--- .../hooks/useHideModalUntilResolved.ts | 25 ------------------- .../AssignNewHostModal/AssignNewHostModal.tsx | 6 ++--- .../components/steps/SelectTypeStep.tsx | 6 ++--- .../ProfileSettingsModal.tsx | 5 +--- .../modals/SessionModal/SessionModal.tsx | 6 ++--- 6 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 client/src/lib/navigation/hooks/useHideModalUntilResolved.ts diff --git a/client/src/lib/components/ProfileInfo/ProfileInfo.tsx b/client/src/lib/components/ProfileInfo/ProfileInfo.tsx index f7e3d8c910..c015217858 100644 --- a/client/src/lib/components/ProfileInfo/ProfileInfo.tsx +++ b/client/src/lib/components/ProfileInfo/ProfileInfo.tsx @@ -11,7 +11,6 @@ import useUpdateProfileDetails from '../../user/hooks/useUpdateProfileDetails'; import ProfilePicture from '../User/ProfilePicture'; import useUser from '../../user/hooks/useUser'; import {COLORS} from '../../../../../shared/src/constants/colors'; -import useHideModalUntilResolved from '../../navigation/hooks/useHideModalUntilResolved'; const Container = styled.View({ alignItems: 'center', @@ -47,8 +46,6 @@ const ProfileInfo: React.FC = ({onSaveCallback}) => { useChangeProfilePicture(); const {updateProfileDetails, isUpdatingProfileDetails} = useUpdateProfileDetails(); - const hideModalAndChangeProfilePicture = - useHideModalUntilResolved(changeProfilePicture); const [displayName, setDisplayName] = useState(user?.displayName ?? ''); const [nameMissing, setNameMissing] = useState(false); const [pictureMissing, setPictureMissing] = useState(false); @@ -97,7 +94,7 @@ const ProfileInfo: React.FC = ({onSaveCallback}) => { pictureURL={user?.photoURL} hasError={pictureMissing} loading={isUpdatingProfilePicture} - onPress={hideModalAndChangeProfilePicture} + onPress={changeProfilePicture} size={SPACINGS.NINTYSIX} /> diff --git a/client/src/lib/navigation/hooks/useHideModalUntilResolved.ts b/client/src/lib/navigation/hooks/useHideModalUntilResolved.ts deleted file mode 100644 index 7cacc8df43..0000000000 --- a/client/src/lib/navigation/hooks/useHideModalUntilResolved.ts +++ /dev/null @@ -1,25 +0,0 @@ -import {useBottomSheet} from '@gorhom/bottom-sheet'; -import {useCallback} from 'react'; - -/* - This hook hides the current modal and opens the share modal to prevent it from being rendered behind the current modal - Bottom sheet modals are rendered with FullWindowModal, which is a full-screen modal that covers the entire screen - https://github.com/th3rdwave/react-navigation-bottom-sheet/blob/ef8c616559a3fdbb67149d6e1ebc9bb662d71255/src/BottomSheetView.tsx#L27-L31 -*/ -const useHideModalUntilResolved = ( - fn: (...args: TArgs) => Promise, -) => { - const bottomSheet = useBottomSheet(); - return useCallback( - async (...args: TArgs) => { - const currentSnapIndex = bottomSheet.animatedIndex.value; - bottomSheet.snapToPosition(0.0000001); // Hide without closing it - const ret = await fn(...args); - bottomSheet.snapToIndex(currentSnapIndex); // Restore the position - return ret; - }, - [bottomSheet, fn], - ); -}; - -export default useHideModalUntilResolved; diff --git a/client/src/routes/modals/AssignNewHostModal/AssignNewHostModal.tsx b/client/src/routes/modals/AssignNewHostModal/AssignNewHostModal.tsx index dce69751bb..ce29b87d7d 100644 --- a/client/src/routes/modals/AssignNewHostModal/AssignNewHostModal.tsx +++ b/client/src/routes/modals/AssignNewHostModal/AssignNewHostModal.tsx @@ -25,7 +25,6 @@ import {SPACINGS} from '../../../lib/constants/spacings'; import {ModalHeading} from '../../../lib/components/Typography/Heading/Heading'; import useConfirmSessionReminder from '../../../lib/sessions/hooks/useConfirmSessionReminder'; import {getSessionHostingLink} from '../../../lib/sessions/api/session'; -import useHideModalUntilResolved from '../../../lib/navigation/hooks/useHideModalUntilResolved'; const Row = styled(View)({ flexDirection: 'row', @@ -42,18 +41,17 @@ const AssignNewHostModal = () => { const exercise = useExerciseById(session?.exerciseId, session?.language); const confirmToggleReminder = useConfirmSessionReminder(session); - const hideModalAndShare = useHideModalUntilResolved(Share.share); const isHost = user?.uid === session.hostId; const onHostChange = useCallback(async () => { const link = await getSessionHostingLink(session.id); if (link) { - hideModalAndShare({ + Share.share({ message: link, }); } - }, [session.id, hideModalAndShare]); + }, [session.id]); useEffect(() => { if (isHost) { diff --git a/client/src/routes/modals/CreateSessionModal/components/steps/SelectTypeStep.tsx b/client/src/routes/modals/CreateSessionModal/components/steps/SelectTypeStep.tsx index 083d34e52e..7f02e47a4d 100644 --- a/client/src/routes/modals/CreateSessionModal/components/steps/SelectTypeStep.tsx +++ b/client/src/routes/modals/CreateSessionModal/components/steps/SelectTypeStep.tsx @@ -57,7 +57,6 @@ import CoCreators from '../../../../../lib/components/CoCreators/CoCreators'; import CardGraphic from '../../../../../lib/components/CardGraphic/CardGraphic'; import BackgroundBlock from '../../../../../lib/components/BackgroundBlock/BackgroundBlock'; import useGetSessionCardTags from '../../../../../lib/components/Cards/SessionCard/hooks/useGetSessionCardTags'; -import useHideModalUntilResolved from '../../../../../lib/navigation/hooks/useHideModalUntilResolved'; const TypeItemWrapper = styled.View<{isLast?: boolean}>(({isLast}) => ({ flexDirection: 'row', @@ -162,7 +161,6 @@ const SelectTypeStep: React.FC = ({ useNavigation>(); const getExerciseById = useGetExerciseById(); const startSession = useStartAsyncSession(); - const hideModalAndShare = useHideModalUntilResolved(Share.share); const {rating} = useExerciseRating(selectedExercise); const {feedback} = useExerciseFeedback(selectedExercise); @@ -197,11 +195,11 @@ const SelectTypeStep: React.FC = ({ const onShare = useCallback(() => { if (exercise?.link) { - hideModalAndShare({ + Share.share({ message: exercise.link, }); } - }, [exercise?.link, hideModalAndShare]); + }, [exercise?.link]); const onStartPress = useCallback(() => { if (selectedExercise) { diff --git a/client/src/routes/modals/ProfileSettingsModal/ProfileSettingsModal.tsx b/client/src/routes/modals/ProfileSettingsModal/ProfileSettingsModal.tsx index a4871b9a5a..63c92c609d 100644 --- a/client/src/routes/modals/ProfileSettingsModal/ProfileSettingsModal.tsx +++ b/client/src/routes/modals/ProfileSettingsModal/ProfileSettingsModal.tsx @@ -41,7 +41,6 @@ import {SPACINGS} from '../../../lib/constants/spacings'; import useUserState from '../../../lib/user/state/state'; import ActionSwitch from '../../../lib/components/ActionList/ActionItems/ActionSwitch'; import useLogMindfulMinutes from '../../../lib/mindfulMinutes/hooks/useLogMindfulMinutes'; -import useHideModalUntilResolved from '../../../lib/navigation/hooks/useHideModalUntilResolved'; const Picture = styled(ProfilePicture)({ width: 144, @@ -72,8 +71,6 @@ const ProfileSettingsModal = () => { useChangeProfilePicture(); const {updateProfileDetails, isUpdatingProfileDetails} = useUpdateProfileDetails(); - const hideModalAndChangeProfilePicture = - useHideModalUntilResolved(changeProfilePicture); const {deleteUser} = useDeleteUser(); const signOut = useSignOutUser(); const user = useUser(); @@ -160,7 +157,7 @@ const ProfileSettingsModal = () => { pictureURL={user?.photoURL} letter={user?.displayName?.[0]} loading={isUpdatingProfilePicture} - onPress={hideModalAndChangeProfilePicture} + onPress={changeProfilePicture} /> diff --git a/client/src/routes/modals/SessionModal/SessionModal.tsx b/client/src/routes/modals/SessionModal/SessionModal.tsx index 24dc6f403a..7d39e6db1f 100644 --- a/client/src/routes/modals/SessionModal/SessionModal.tsx +++ b/client/src/routes/modals/SessionModal/SessionModal.tsx @@ -78,7 +78,6 @@ import BackgroundBlock from '../../../lib/components/BackgroundBlock/BackgroundB import SheetModal from '../../../lib/components/Modals/SheetModal'; import {BottomSheetScrollView} from '@gorhom/bottom-sheet'; import {SessionMode} from '../../../../../shared/src/schemas/Session'; -import useHideModalUntilResolved from '../../../lib/navigation/hooks/useHideModalUntilResolved'; const Content = styled(Gutters)({ justifyContent: 'space-between', @@ -156,7 +155,6 @@ const SessionModal = () => { const navigation = useNavigation>(); - const hideModalAndshare = useHideModalUntilResolved(Share.share); const addToCalendar = useAddSessionToCalendar(); const exercise = useExerciseById(session.exerciseId, session.language); const tags = useGetSessionCardTags(exercise, SessionMode.live); @@ -205,11 +203,11 @@ const SessionModal = () => { const onShare = useCallback(() => { if (session.link) { - hideModalAndshare({ + Share.share({ message: session.link, }); } - }, [session.link, hideModalAndshare]); + }, [session.link]); const onHostPress = useCallback(() => { navigation.popToTop(); From 1a17c0edb9f8a16ecd507ff607023e97067fbfcc Mon Sep 17 00:00:00 2001 From: gewfy Date: Wed, 1 Jan 2025 16:48:35 +0100 Subject: [PATCH 20/28] Override containerComponent with Fragment --- client/src/lib/navigation/ModalStack.tsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/client/src/lib/navigation/ModalStack.tsx b/client/src/lib/navigation/ModalStack.tsx index 5b61931f02..87b488c86e 100644 --- a/client/src/lib/navigation/ModalStack.tsx +++ b/client/src/lib/navigation/ModalStack.tsx @@ -1,5 +1,4 @@ -import React, {useMemo} from 'react'; -import {StyleSheet} from 'react-native'; +import React, {Fragment, useMemo} from 'react'; import { BottomSheetNavigationOptions, @@ -51,15 +50,10 @@ import SessionModal from '../../routes/modals/SessionModal/SessionModal'; import FeedbackPostModal from '../../routes/modals/FeedbackPostModal/FeedbackPostModal'; import LiveSessionsModal from '../../routes/modals/LiveSessionsModal/LiveSessionsModal'; import UnlockCollectionModal from '../../routes/modals/UnlockCollectionModal/UnlockCollectionModal'; -import styled from 'styled-components/native'; const {Navigator, Screen, Group} = createBottomSheetNavigator(); -const ContainerComponent = styled.View.attrs({ - pointerEvents: 'box-none', -})({...StyleSheet.absoluteFillObject}); - const BackdropComponent = ({ animatedIndex, animatedPosition, @@ -77,7 +71,7 @@ const BackdropComponent = ({ ); const modalScreenOptions: BottomSheetNavigationOptions = { - containerComponent: ContainerComponent, + containerComponent: Fragment, backdropComponent: BackdropComponent, backgroundStyle: { backgroundColor: 'transparent', From 8eb708302966bccb5c2b4ca4e7a822d62c8b962f Mon Sep 17 00:00:00 2001 From: gewfy Date: Wed, 1 Jan 2025 16:53:47 +0100 Subject: [PATCH 21/28] Updated Podfile --- client/ios/Podfile.lock | 55 +++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index d8462a938b..855596abd8 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -2100,9 +2100,9 @@ PODS: - React-Core - react-native-idle-timer (2.2.3): - React-Core - - react-native-netinfo (11.3.2): + - react-native-netinfo (11.4.1): - React-Core - - react-native-safe-area-context (4.10.9): + - react-native-safe-area-context (4.14.0): - React-Core - react-native-volume-manager (1.10.0): - Mute @@ -2368,7 +2368,7 @@ PODS: - React-Core - RNDateTimePicker (8.2.0): - React-Core - - RNDeviceInfo (11.1.0): + - RNDeviceInfo (14.0.2): - React-Core - RNFBApp (20.3.0): - Firebase/CoreOnly (= 10.29.0) @@ -2412,28 +2412,47 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - RNImageCropPicker (0.41.2): + - RNImageCropPicker (0.41.6): - React-Core - React-RCTImage - - RNImageCropPicker/QBImagePickerController (= 0.41.2) + - RNImageCropPicker/QBImagePickerController (= 0.41.6) - TOCropViewController (~> 2.7.4) - - RNImageCropPicker/QBImagePickerController (0.41.2): + - RNImageCropPicker/QBImagePickerController (0.41.6): - React-Core - React-RCTImage - TOCropViewController (~> 2.7.4) - RNLocalize (3.2.1): - React-Core - - RNNotifee (9.1.1): + - RNNotifee (9.1.3): - React-Core - - RNNotifee/NotifeeCore (= 9.1.1) - - RNNotifee/NotifeeCore (9.1.1): + - RNNotifee/NotifeeCore (= 9.1.3) + - RNNotifee/NotifeeCore (9.1.3): - React-Core - RNPermissions (4.1.5): - React-Core - RNRate (1.2.12): - React-Core - - RNReactNativeHapticFeedback (2.2.0): + - RNReactNativeHapticFeedback (2.3.3): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2024.01.01.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen - React-Core + - React-debug + - React-Fabric + - React-featureflags + - React-graphics + - React-ImageManager + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - RNReanimated (3.16.4): - DoubleConversion - glog @@ -2521,7 +2540,7 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - RNScreens (4.3.0): + - RNScreens (4.4.0): - DoubleConversion - glog - hermes-engine @@ -2996,8 +3015,8 @@ SPEC CHECKSUMS: react-native-daily-js: 6f3b0930d5fd7fc94648eb334a35d3efe538c93c react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06 react-native-idle-timer: b4e9ff189950bcd3ba03257d9f033f3432341db8 - react-native-netinfo: 076df4f9b07f6670acf4ce9a75aac8d34c2e2ccc - react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a + react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac + react-native-safe-area-context: 4532f1a0c5d34a46b9324ccaaedcb5582a302b7d react-native-volume-manager: 3c7d8047841b6831730dea7bf25250522388b4f4 react-native-webrtc: f0863a670c08895cebfd74d7790e499397d5be1a react-native-webview: 91800ab1c604389120f4abe895328ff7736513fb @@ -3029,21 +3048,21 @@ SPEC CHECKSUMS: RNCAsyncStorage: ec53e44dc3e75b44aa2a9f37618a49c3bc080a7a RNCPicker: b7873ba797dc586bfaf3307d737cbdc620a9ff3e RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14 - RNDeviceInfo: b899ce37a403a4dea52b7cb85e16e49c04a5b88e + RNDeviceInfo: 3f2e5fcca3637f75c6d30ba287293c2f97206781 RNFBApp: 793adb33298db7e67dc365dc1ec0dc8a55a7a044 RNFBAuth: e923d3f87088009ac8505140599ec1e784d77bd0 RNFBDynamicLinks: 6e5d52576c079e65040110c8a9b895c6e1f02edc RNFBFirestore: 9b5e7d645787f02d5d16c4e060e778e9da762e02 RNFBStorage: a86f59a4adae00b3061e55257d6c3d70851a1810 RNGestureHandler: 38b7949a58a56ae0e2a3c38920cb6852cafb6b9f - RNImageCropPicker: 771e2ca319d2cf92e04ebf334ece892ee9a6728f + RNImageCropPicker: 8e39c01f205e00d739c31e682f068aac315587bf RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc - RNNotifee: 35b5f984d11083b02d7f2990b3408cd99a0aeeac + RNNotifee: 522276e0be010e98173175fb838514b69f18cbe0 RNPermissions: a58e61bd4e6bd417adcf8ef8ca094b93d772e492 RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a - RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9 + RNReactNativeHapticFeedback: dd1df8ab143dfd0ac79fe483cd08822d7a86fc85 RNReanimated: 13f9f061449dd7a1f6e1b8fb4caf18b880b41bd1 - RNScreens: d090bfb033bb48f8da0983999ea58868e813cb80 + RNScreens: a582697173dfacb627c9366a80881ffb5dd92971 RNSentry: d2f4b8dc672fb4e26b50b99e006e52d547e36b3f RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57 From 1768a897c5688ab10898bf4316d3b8e75de64799 Mon Sep 17 00:00:00 2001 From: gewfy <474066+gewfy@users.noreply.github.com> Date: Wed, 1 Jan 2025 16:25:56 +0000 Subject: [PATCH 22/28] Native Version Bump --- client/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle index 28a033963c..1c2593c365 100644 --- a/client/android/app/build.gradle +++ b/client/android/app/build.gradle @@ -81,7 +81,7 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 211 + versionCode 212 versionName "2.59.0" } signingConfigs { From 20c95bc36c26c5bfdce45f24775a2c729999fc25 Mon Sep 17 00:00:00 2001 From: gewfy <474066+gewfy@users.noreply.github.com> Date: Wed, 1 Jan 2025 19:29:14 +0000 Subject: [PATCH 23/28] Native Version Bump --- client/ios/Podfile.lock | 2 +- client/ios/Supporting/Info.plist | 2 +- client/ios/twentyninek.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 855596abd8..9e310f840a 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -3078,7 +3078,7 @@ SPEC CHECKSUMS: StripePaymentsUI: 7d7cffb2ecfc0d6b5ac3a4488c02893a5ff6cc77 StripeUICore: bb102d453b1e1a10a37f810bc0a9aa0675fb17fd TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - Yoga: bd92064a0d558be92786820514d74fc4dddd1233 + Yoga: eed50599a85bd9f6882a9938d118aed6a397db9c PODFILE CHECKSUM: 1e2c5c3ea8152bd7472ee44e381909c2f6afd170 diff --git a/client/ios/Supporting/Info.plist b/client/ios/Supporting/Info.plist index 5a4dee15da..9a6c2d519e 100644 --- a/client/ios/Supporting/Info.plist +++ b/client/ios/Supporting/Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 191 + 192 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/client/ios/twentyninek.xcodeproj/project.pbxproj b/client/ios/twentyninek.xcodeproj/project.pbxproj index 071e360c0b..343143d025 100644 --- a/client/ios/twentyninek.xcodeproj/project.pbxproj +++ b/client/ios/twentyninek.xcodeproj/project.pbxproj @@ -1042,7 +1042,7 @@ CODE_SIGN_ENTITLEMENTS = production.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1076,7 +1076,7 @@ CODE_SIGN_ENTITLEMENTS = production.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1108,7 +1108,7 @@ CODE_SIGN_ENTITLEMENTS = dev.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1142,7 +1142,7 @@ CODE_SIGN_ENTITLEMENTS = dev.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1175,7 +1175,7 @@ CODE_SIGN_ENTITLEMENTS = staging.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1209,7 +1209,7 @@ CODE_SIGN_ENTITLEMENTS = staging.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 191; + CURRENT_PROJECT_VERSION = 192; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( From a857540dbb4026d8ba0da94e570fc04abf4b5fca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:16:26 +0000 Subject: [PATCH 24/28] Bump @daily-co/react-native-daily-js from 0.69.0 to 0.71.0 in /client Bumps [@daily-co/react-native-daily-js](https://github.com/daily-co/react-native-daily-js) from 0.69.0 to 0.71.0. - [Release notes](https://github.com/daily-co/react-native-daily-js/releases) - [Commits](https://github.com/daily-co/react-native-daily-js/compare/react-native-daily-js-2024-09-12-0.69.0...react-native-daily-js-2025-01-02-0.71.0) --- updated-dependencies: - dependency-name: "@daily-co/react-native-daily-js" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 68 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/client/package.json b/client/package.json index 7b05ca8416..e589e29f39 100644 --- a/client/package.json +++ b/client/package.json @@ -21,7 +21,7 @@ "test": "yarn build:content && yarn test:ts && yarn test:lint && yarn test:jest" }, "dependencies": { - "@daily-co/react-native-daily-js": "0.69.0", + "@daily-co/react-native-daily-js": "0.71.0", "@daily-co/react-native-webrtc": "118.0.3-daily.1", "@dotlottie/react-player": "^1.6.19", "@gorhom/bottom-sheet": "^4.6.4", diff --git a/client/yarn.lock b/client/yarn.lock index 92e2093cf9..211412c856 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1539,23 +1539,23 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@daily-co/daily-js@^0.71.2": - version "0.71.2" - resolved "https://registry.yarnpkg.com/@daily-co/daily-js/-/daily-js-0.71.2.tgz#7dcbacaf35eed06436af0e478b4bbd8546cf9fd1" - integrity sha512-wBhINS5gJE+EKp1RoWcnpjVn2cW5/3AhVsOroFvvU8DJHjwOgTffFoiVfPmn7Tes33Gx91h0diNOflDkEs1AQw== +"@daily-co/daily-js@^0.74.0": + version "0.74.0" + resolved "https://registry.yarnpkg.com/@daily-co/daily-js/-/daily-js-0.74.0.tgz#e0991bf4b8f97a0c54467f2385afdb8f9d6cc201" + integrity sha512-wyZzt+sH7yh5Cg3DQeoZ1Yen8+bbai0/Zq8JZzklqELrpjiFuu34e3qwjwt79cx7T9eukbZbK6gtk3cmCBW3iw== dependencies: "@babel/runtime" "^7.12.5" - "@sentry/browser" "^7.60.1" + "@sentry/browser" "^8.33.1" bowser "^2.8.1" dequal "^2.0.3" events "^3.1.0" -"@daily-co/react-native-daily-js@0.69.0": - version "0.69.0" - resolved "https://registry.yarnpkg.com/@daily-co/react-native-daily-js/-/react-native-daily-js-0.69.0.tgz#890e8b19645024280cebd6cb5a5117fa60c369e2" - integrity sha512-lyLb8NYAzSOwoPnUx+2B2Xr/HqZDgPO7EG20vs1CCr8LnJk8zLqRxbYulAvrm43lagKV+sgkH6tIaI1uQdh7QQ== +"@daily-co/react-native-daily-js@0.71.0": + version "0.71.0" + resolved "https://registry.yarnpkg.com/@daily-co/react-native-daily-js/-/react-native-daily-js-0.71.0.tgz#dd8285b610b044a8253c0f79b5b3056c39ef9266" + integrity sha512-FPl5bQ5TQnTC9SibHKqNF9KEZ/3Y+0XBtT2hzwTbfNTy+yz9ZzWEVGypx67ml75XcoHOE45SudL3dDRg3ZmF8w== dependencies: - "@daily-co/daily-js" "^0.71.2" + "@daily-co/daily-js" "^0.74.0" "@types/react-native-background-timer" "^2.0.0" base-64 "^1.0.0" react-native-url-polyfill "^1.1.2" @@ -3557,6 +3557,13 @@ mkdirp "^1.0.4" rimraf "^3.0.2" +"@sentry-internal/browser-utils@8.47.0": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/browser-utils/-/browser-utils-8.47.0.tgz#39f2766a1bbdffc2d211e2f61f8ed8c258245b3d" + integrity sha512-vOXzYzHTKkahTLDzWWIA4EiVCQ+Gk+7xGWUlNcR2ZiEPBqYZVb5MjsUozAcc7syrSUy6WicyFjcomZ3rlCVQhg== + dependencies: + "@sentry/core" "8.47.0" + "@sentry-internal/feedback@7.119.0": version "7.119.0" resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-7.119.0.tgz#429b3ea0fd34e928d2e7de5dcbe9377272a3f221" @@ -3566,6 +3573,13 @@ "@sentry/types" "7.119.0" "@sentry/utils" "7.119.0" +"@sentry-internal/feedback@8.47.0": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/feedback/-/feedback-8.47.0.tgz#22bceac03b61ab8509e79c0875fb140f214b7c4f" + integrity sha512-IAiIemTQIalxAOYhUENs9bZ8pMNgJnX3uQSuY7v0gknEqClOGpGkG04X/cxCmtJUj1acZ9ShTGDxoh55a+ggAQ== + dependencies: + "@sentry/core" "8.47.0" + "@sentry-internal/replay-canvas@7.119.0": version "7.119.0" resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-7.119.0.tgz#85669d184ba79150e64d05de02f5e2b616e68371" @@ -3576,6 +3590,22 @@ "@sentry/types" "7.119.0" "@sentry/utils" "7.119.0" +"@sentry-internal/replay-canvas@8.47.0": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay-canvas/-/replay-canvas-8.47.0.tgz#5bbd04c81235b2bf627aa216185ae1993d2102c4" + integrity sha512-M4W9UGouEeELbGbP3QsXLDVtGiQSZoWJlKwqMWyqdQgZuLoKw0S33+60t6teLVMhuQZR0UI9VJTF5coiXysnnA== + dependencies: + "@sentry-internal/replay" "8.47.0" + "@sentry/core" "8.47.0" + +"@sentry-internal/replay@8.47.0": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/replay/-/replay-8.47.0.tgz#4f7bd359df2de25d919a378295cab67dfa05a406" + integrity sha512-G/S40ZBORj0HSMLw/uVC6YDEPN/dqVk901vf4VYfml686DEhJrZesfAfp5SydJumQ0NKZQrdtvny+BWnlI5H1w== + dependencies: + "@sentry-internal/browser-utils" "8.47.0" + "@sentry/core" "8.47.0" + "@sentry-internal/tracing@7.119.0": version "7.119.0" resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.119.0.tgz#201561af2a4ad1837333287c26050a5e688537ca" @@ -3590,7 +3620,7 @@ resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.20.1.tgz#204c63ed006a048f48f633876e1b8bacf87a9722" integrity sha512-4mhEwYTK00bIb5Y9UWIELVUfru587Vaeg0DQGswv4aIRHIiMKLyNqCEejaaybQ/fNChIZOKmvyqXk430YVd7Qg== -"@sentry/browser@7.119.0", "@sentry/browser@^7.60.1": +"@sentry/browser@7.119.0": version "7.119.0" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.119.0.tgz#65004015c107be5d2f49a852ebcffc5d19d90e0d" integrity sha512-WwmW1Y4D764kVGeKmdsNvQESZiAn9t8LmCWO0ucBksrjL2zw9gBPtOpRcO6l064sCLeSxxzCN+kIxhRm1gDFEA== @@ -3604,6 +3634,17 @@ "@sentry/types" "7.119.0" "@sentry/utils" "7.119.0" +"@sentry/browser@^8.33.1": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-8.47.0.tgz#fe0b6b65c0394f54438d6704039adeaec214ce18" + integrity sha512-K6BzHisykmbFy/wORtGyfsAlw7ShevLALzu3ReZZZ18dVubO1bjSNjkZQU9MJD5Jcb9oLwkq89n3N9XIBfvdRA== + dependencies: + "@sentry-internal/browser-utils" "8.47.0" + "@sentry-internal/feedback" "8.47.0" + "@sentry-internal/replay" "8.47.0" + "@sentry-internal/replay-canvas" "8.47.0" + "@sentry/core" "8.47.0" + "@sentry/cli-darwin@2.36.1": version "2.36.1" resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.36.1.tgz#786adf6984dbe3c6fb7dac51b625c314117b807d" @@ -3720,6 +3761,11 @@ "@sentry/types" "7.119.0" "@sentry/utils" "7.119.0" +"@sentry/core@8.47.0": + version "8.47.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-8.47.0.tgz#e811444552f7a91b5de573875a318a6cd4e802f8" + integrity sha512-iSEJZMe3DOcqBFZQAqgA3NB2lCWBc4Gv5x/SCri/TVg96wAlss4VrUunSI2Mp0J4jJ5nJcJ2ChqHSBAU48k3FA== + "@sentry/hub@7.119.0": version "7.119.0" resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.119.0.tgz#a94d657b9d3cfd4cc061c5c238f86faefb55d5d8" From a71c2371b19298a0558eda2799de17d8c4ccc8e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:16:54 +0000 Subject: [PATCH 25/28] Bump react-native-permissions from 4.1.5 to 5.2.2 in /client Bumps [react-native-permissions](https://github.com/zoontek/react-native-permissions) from 4.1.5 to 5.2.2. - [Release notes](https://github.com/zoontek/react-native-permissions/releases) - [Commits](https://github.com/zoontek/react-native-permissions/compare/4.1.5...5.2.2) --- updated-dependencies: - dependency-name: react-native-permissions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- client/package.json | 2 +- client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/package.json b/client/package.json index 7b05ca8416..64d989066a 100644 --- a/client/package.json +++ b/client/package.json @@ -75,7 +75,7 @@ "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-permissions": "^5.2.2", "react-native-rate": "^1.2.12", "react-native-reanimated": "^3.15.4", "react-native-safe-area-context": "^4.10.9", diff --git a/client/yarn.lock b/client/yarn.lock index 92e2093cf9..e2ef53cb90 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -9995,10 +9995,10 @@ react-native-markdown-display@^7.0.2: prop-types "^15.7.2" react-native-fit-image "^1.5.5" -react-native-permissions@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-4.1.5.tgz#db4d1ddbf076570043f4fd4168f54bb6020aec92" - integrity sha512-r6VMRacASmtRHS+GZ+5HQCp9p9kiE+UU9magHOZCXZLTJitdTuVHWZRrb4v4oqZGU+zAp3mZhTQftuMMv+WLUg== +react-native-permissions@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-5.2.2.tgz#1eb9849ef23500b4d618cf9c2049f40069fa6946" + integrity sha512-Mae5VKT8bjliksONZ+jMYTPf90wxuhn1H1FiH/kRfw0Y5tW5WIV1P8t/KiEHKZRvimnrInimuCr+EpRzK0IPWQ== react-native-rate@^1.2.12: version "1.2.12" From 26ea87ec8c205758ecd88f3c7aa7d874bc21e796 Mon Sep 17 00:00:00 2001 From: gewfy Date: Tue, 7 Jan 2025 10:04:06 +0100 Subject: [PATCH 26/28] Updated Podfile --- client/ios/Podfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 9e310f840a..0eadbb5e6d 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -2093,7 +2093,7 @@ PODS: - React-Core - react-native-background-timer (2.4.1): - React-Core - - react-native-daily-js (0.69.0): + - react-native-daily-js (0.71.0): - React-Core - ReactNativeDailyJSScreenShareExtension (= 0.0.1) - react-native-get-random-values (1.11.0): @@ -2428,7 +2428,7 @@ PODS: - RNNotifee/NotifeeCore (= 9.1.3) - RNNotifee/NotifeeCore (9.1.3): - React-Core - - RNPermissions (4.1.5): + - RNPermissions (5.2.2): - React-Core - RNRate (1.2.12): - React-Core @@ -3012,7 +3012,7 @@ SPEC CHECKSUMS: React-Mapbuffer: 70da5955150a58732e9336a0c7e71cd49e909f25 react-native-add-calendar-event: b9802a8be8ad4beb0dcb3efb28969c077558fb29 react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe - react-native-daily-js: 6f3b0930d5fd7fc94648eb334a35d3efe538c93c + react-native-daily-js: ba55f2e6393ac507dd91972b7df509543552c454 react-native-get-random-values: 21325b2244dfa6b58878f51f9aa42821e7ba3d06 react-native-idle-timer: b4e9ff189950bcd3ba03257d9f033f3432341db8 react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac @@ -3058,7 +3058,7 @@ SPEC CHECKSUMS: RNImageCropPicker: 8e39c01f205e00d739c31e682f068aac315587bf RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc RNNotifee: 522276e0be010e98173175fb838514b69f18cbe0 - RNPermissions: a58e61bd4e6bd417adcf8ef8ca094b93d772e492 + RNPermissions: b8fcf4c21a018a2eb1869231f3e121aa97c0f642 RNRate: ef3bcff84f39bb1d1e41c5593d3eea4aab2bd73a RNReactNativeHapticFeedback: dd1df8ab143dfd0ac79fe483cd08822d7a86fc85 RNReanimated: 13f9f061449dd7a1f6e1b8fb4caf18b880b41bd1 @@ -3078,7 +3078,7 @@ SPEC CHECKSUMS: StripePaymentsUI: 7d7cffb2ecfc0d6b5ac3a4488c02893a5ff6cc77 StripeUICore: bb102d453b1e1a10a37f810bc0a9aa0675fb17fd TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - Yoga: eed50599a85bd9f6882a9938d118aed6a397db9c + Yoga: bd92064a0d558be92786820514d74fc4dddd1233 PODFILE CHECKSUM: 1e2c5c3ea8152bd7472ee44e381909c2f6afd170 From 5e1b51db51a0ae7fdd079f457ae4c0588966a183 Mon Sep 17 00:00:00 2001 From: gewfy <474066+gewfy@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:34:21 +0000 Subject: [PATCH 27/28] Native Version Bump --- client/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle index 1c2593c365..84de5a3bf9 100644 --- a/client/android/app/build.gradle +++ b/client/android/app/build.gradle @@ -81,7 +81,7 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 212 + versionCode 213 versionName "2.59.0" } signingConfigs { From 303940984bbc569039121a7fdbaf44d2c8aacf92 Mon Sep 17 00:00:00 2001 From: gewfy <474066+gewfy@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:23:12 +0000 Subject: [PATCH 28/28] Native Version Bump --- client/ios/Podfile.lock | 2 +- client/ios/Supporting/Info.plist | 2 +- client/ios/twentyninek.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 0eadbb5e6d..60ec461b53 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -3078,7 +3078,7 @@ SPEC CHECKSUMS: StripePaymentsUI: 7d7cffb2ecfc0d6b5ac3a4488c02893a5ff6cc77 StripeUICore: bb102d453b1e1a10a37f810bc0a9aa0675fb17fd TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654 - Yoga: bd92064a0d558be92786820514d74fc4dddd1233 + Yoga: eed50599a85bd9f6882a9938d118aed6a397db9c PODFILE CHECKSUM: 1e2c5c3ea8152bd7472ee44e381909c2f6afd170 diff --git a/client/ios/Supporting/Info.plist b/client/ios/Supporting/Info.plist index 9a6c2d519e..8a99fe1007 100644 --- a/client/ios/Supporting/Info.plist +++ b/client/ios/Supporting/Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 192 + 193 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/client/ios/twentyninek.xcodeproj/project.pbxproj b/client/ios/twentyninek.xcodeproj/project.pbxproj index 343143d025..614e05c0d3 100644 --- a/client/ios/twentyninek.xcodeproj/project.pbxproj +++ b/client/ios/twentyninek.xcodeproj/project.pbxproj @@ -1042,7 +1042,7 @@ CODE_SIGN_ENTITLEMENTS = production.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1076,7 +1076,7 @@ CODE_SIGN_ENTITLEMENTS = production.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1108,7 +1108,7 @@ CODE_SIGN_ENTITLEMENTS = dev.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1142,7 +1142,7 @@ CODE_SIGN_ENTITLEMENTS = dev.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -1175,7 +1175,7 @@ CODE_SIGN_ENTITLEMENTS = staging.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; ENABLE_BITCODE = NO; INFOPLIST_FILE = ./Supporting/Info.plist; @@ -1209,7 +1209,7 @@ CODE_SIGN_ENTITLEMENTS = staging.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 192; + CURRENT_PROJECT_VERSION = 193; DEVELOPMENT_TEAM = 68Y57ZGKLJ; INFOPLIST_FILE = ./Supporting/Info.plist; LD_RUNPATH_SEARCH_PATHS = (