Skip to content

Commit

Permalink
Merge pull request #44557 from Expensify/mountiny-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-44555-1

🍒 Cherry pick PR #44555 to staging 🍒
  • Loading branch information
mountiny authored Jun 27, 2024
2 parents f58d10c + 7bfac37 commit 0a3b9d1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.2.4</string>
<string>9.0.2.5</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.2.4</string>
<string>9.0.2.5</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.0.2</string>
<key>CFBundleVersion</key>
<string>9.0.2.4</string>
<string>9.0.2.5</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
13 changes: 13 additions & 0 deletions patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
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;
}

0 comments on commit 0a3b9d1

Please sign in to comment.