From dac6363b5cd75699cf5ede12f1a14f3c3cd53416 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 27 Jun 2024 17:14:28 +0000 Subject: [PATCH 1/3] Update version to 9.0.2-5 (cherry picked from commit d5ceeef13c987ae2e51d1f9ab8a9dbf1a328b11e) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3806a6d061ba..43ca375e4898 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009000204 - versionName "9.0.2-4" + versionCode 1009000205 + versionName "9.0.2-5" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 46dfd0861756..d202b7f12fc6 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.2.4 + 9.0.2.5 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 1bd7788e2cf9..50ecacce28c8 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.2.4 + 9.0.2.5 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 450d78aaaff5..41b0794094cf 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.2 CFBundleVersion - 9.0.2.4 + 9.0.2.5 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 32925be987f8..8bdeac7c671f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.2-4", + "version": "9.0.2-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.2-4", + "version": "9.0.2-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 923d9c91e4f4..736ef36242e1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.2-4", + "version": "9.0.2-5", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 8d87d2288c57ab8a101751629fba1f8f2cf8e8f3 Mon Sep 17 00:00:00 2001 From: Monil Bhavsar Date: Thu, 27 Jun 2024 22:31:02 +0530 Subject: [PATCH 2/3] Merge pull request #44555 from Expensify/vit-patch44437 [CP Staging] Skip ReanimatedCommitMarker assertion in RNReanimated (cherry picked from commit 4af2b3ff82fd74f67aeea672088241fc489fd896) --- ...reanimated+3.8.1+003+fix-strict-mode.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch diff --git a/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch new file mode 100644 index 000000000000..ccc208062d10 --- /dev/null +++ b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch @@ -0,0 +1,36 @@ +diff --git a/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp b/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp +index 3404e89..b545cb6 100644 +--- a/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp ++++ b/node_modules/react-native-reanimated/Common/cpp/Fabric/ReanimatedCommitMarker.cpp +@@ -9,7 +9,7 @@ namespace reanimated { + thread_local bool ReanimatedCommitMarker::reanimatedCommitFlag_{false}; + + ReanimatedCommitMarker::ReanimatedCommitMarker() { +- react_native_assert(reanimatedCommitFlag_ != true); ++ // react_native_assert(reanimatedCommitFlag_ != true); + reanimatedCommitFlag_ = true; + } + +diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js +index e69c581..78b7034 100644 +--- a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js ++++ b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js +@@ -7,14 +7,11 @@ import { isFabric, isJest, shouldBeUseWeb } from './PlatformChecker'; + import { runOnUIImmediately } from './threads'; + let updateProps; + if (shouldBeUseWeb()) { +- updateProps = (_, updates, maybeViewRef, isAnimatedProps) => { ++ updateProps = (viewDescriptorsSet, updates, maybeViewRef, isAnimatedProps) => { + 'worklet'; +- +- if (maybeViewRef) { +- maybeViewRef.items.forEach((item, _index) => { +- _updatePropsJS(updates, item, isAnimatedProps); +- }); +- } ++ viewDescriptorsSet.value.forEach((viewDescriptor) => { ++ _updatePropsJS(updates, {_component: viewDescriptor.tag}, isAnimatedProps); ++ }) + }; + } else { + updateProps = (viewDescriptors, updates) => { From 7bfac378bfb3e0f5f12121809209ba58aecdc7e8 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Thu, 27 Jun 2024 19:24:42 +0200 Subject: [PATCH 3/3] Resolve merge conflict --- ...reanimated+3.8.1+003+fix-strict-mode.patch | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch index ccc208062d10..bd9c5da55f0e 100644 --- a/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch +++ b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch @@ -10,27 +10,4 @@ index 3404e89..b545cb6 100644 + // react_native_assert(reanimatedCommitFlag_ != true); reanimatedCommitFlag_ = true; } - -diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js -index e69c581..78b7034 100644 ---- a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js -+++ b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js -@@ -7,14 +7,11 @@ import { isFabric, isJest, shouldBeUseWeb } from './PlatformChecker'; - import { runOnUIImmediately } from './threads'; - let updateProps; - if (shouldBeUseWeb()) { -- updateProps = (_, updates, maybeViewRef, isAnimatedProps) => { -+ updateProps = (viewDescriptorsSet, updates, maybeViewRef, isAnimatedProps) => { - 'worklet'; -- -- if (maybeViewRef) { -- maybeViewRef.items.forEach((item, _index) => { -- _updatePropsJS(updates, item, isAnimatedProps); -- }); -- } -+ viewDescriptorsSet.value.forEach((viewDescriptor) => { -+ _updatePropsJS(updates, {_component: viewDescriptor.tag}, isAnimatedProps); -+ }) - }; - } else { - updateProps = (viewDescriptors, updates) => { +