From 290ed871ad918b41bd0f1d383b056994a61a1e9b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 21 Nov 2022 16:18:05 -0500
Subject: [PATCH 1/2] Merge pull request #12901 from
Expensify/version-BUILD-DD3DC0F9-2A18-4C5A-9707-A3C3AB64FF35
Update version to 1.2.29-7 on main
(cherry picked from commit 94f6d369890c56e61b014354d4c58c79d811fc75)
---
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 a0f77597cb4e0..99d297b5812b9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001022906
- versionName "1.2.29-6"
+ versionCode 1001022907
+ versionName "1.2.29-7"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 9924d88e457c1..31401f256b654 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.29.6
+ 1.2.29.7
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5a1b5459afcb5..0648c76aee1bd 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.29.6
+ 1.2.29.7
diff --git a/package-lock.json b/package-lock.json
index 13cf6186d4e9b..dcbd0bb334d05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.29-6",
+ "version": "1.2.29-7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.29-6",
+ "version": "1.2.29-7",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 60d17b15381b2..b5ee46b0c9e85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.29-6",
+ "version": "1.2.29-7",
"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 a4170d0e4ac7ccaa2b22a90d55399b7ae4608bcc Mon Sep 17 00:00:00 2001
From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com>
Date: Mon, 21 Nov 2022 13:12:15 -0800
Subject: [PATCH 2/2] Merge pull request #12897 from
Expensify/revert-12735-delete-comment_fix
Revert "removed resetting the report fields to allow user to operate multiple actions on same popover"
(cherry picked from commit cc88c777dd7229091df73b3a3755a1bb9654daa5)
---
.../home/report/ContextMenu/PopoverReportActionContextMenu.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
index 32f184044d805..d28e7db1ea9c4 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -202,6 +202,8 @@ class PopoverReportActionContextMenu extends React.Component {
this.onPopoverHideActionCallback = onHideActionCallback;
}
this.setState({
+ reportID: '0',
+ reportAction: {},
selection: '',
reportActionDraftMessage: '',
isPopoverVisible: false,