From b9585b609dfcd08c292a7dc7e2094aba9c3169d9 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 24 May 2023 15:57:50 -0400
Subject: [PATCH 1/2] Merge pull request #19555 from
Expensify/version-BUILD-C93FB912-20DF-4915-AB50-8E0F240D5D99
Update version to 1.3.17-5 on main
(cherry picked from commit 6c5694a8f37f96c40300e878803b0ff42ed80c1f)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 972d8caa680a..a61303cf1347 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001031704
- versionName "1.3.17-4"
+ versionCode 1001031705
+ versionName "1.3.17-5"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 250437eeae0d..ae54a442b017 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.3.17.4
+ 1.3.17.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1abe28bff763..ce5ff1e2d531 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.17.4
+ 1.3.17.5
diff --git a/package-lock.json b/package-lock.json
index 1ef526337a56..5df846863262 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.17-4",
+ "version": "1.3.17-5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.17-4",
+ "version": "1.3.17-5",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index c9ad263fbd00..2125a35394f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.17-4",
+ "version": "1.3.17-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 7dece274473c20a3c601a39c6cba1602b1f1104e Mon Sep 17 00:00:00 2001
From: Puneet Lath
Date: Wed, 24 May 2023 15:49:53 -0400
Subject: [PATCH 2/2] Merge pull request #19546 from 0xmiroslav/issue-19543
fix anchor ref on PopoverReportActionContextMenu
(cherry picked from commit 327b786983a1e0bb475431b152bdb3e561be3b6c)
---
.../home/report/ContextMenu/PopoverReportActionContextMenu.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
index 1cc5a6e3b220..da3558181dd6 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -95,7 +95,7 @@ class PopoverReportActionContextMenu extends React.Component {
getContextMenuMeasuredLocation() {
return new Promise((resolve) => {
if (this.contextMenuAnchor) {
- this.contextMenuAnchor.current.measureInWindow((x, y) => resolve({x, y}));
+ (this.contextMenuAnchor.current || this.contextMenuAnchor).measureInWindow((x, y) => resolve({x, y}));
} else {
resolve({x: 0, y: 0});
}
@@ -279,6 +279,7 @@ class PopoverReportActionContextMenu extends React.Component {
anchorPosition={this.state.popoverAnchorPosition}
animationIn="fadeIn"
disableAnimation={false}
+ animationOutTiming={1}
shouldSetModalVisibility={false}
fullscreen
>