From c1b8f249f4204f98e80bc099d798b79236eb9a44 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 9 Dec 2022 00:18:23 -0500
Subject: [PATCH 1/2] Merge pull request #13468 from
Expensify/version-BUILD-AF1736AF-DF7B-4EC4-8879-2D91E7D45D25
Update version to 1.2.37-1 on main
(cherry picked from commit 168800a386e171882dd2e0a3d9ae57954df6fa5f)
---
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 e786e27a7136..1bae507f51d3 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 1001023700
- versionName "1.2.37-0"
+ versionCode 1001023701
+ versionName "1.2.37-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 5b955cd7e739..a1b84fed17a1 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.37.0
+ 1.2.37.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a65379f25781..44cb1b6af9b7 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.37.0
+ 1.2.37.1
diff --git a/package-lock.json b/package-lock.json
index a84c362f2574..bec790b4de32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.37-0",
+ "version": "1.2.37-1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.37-0",
+ "version": "1.2.37-1",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 55f8b2b27283..400c52db75aa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.37-0",
+ "version": "1.2.37-1",
"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 734f33107f2eecbbd8770c69eb417461eeb07c24 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Thu, 8 Dec 2022 19:12:57 -1000
Subject: [PATCH 2/2] Merge pull request #13448 from 0xmiroslav/issue-13435
fix "Upload photo" popup menu not hiding
(cherry picked from commit 5948a0ad743c7e9fbfdcaa5adebcdaf5851831aa)
---
src/components/AttachmentPicker/index.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index 25191883f709..082853285bc4 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -41,6 +41,10 @@ class AttachmentPicker extends React.Component {
// Cleanup after selecting a file to start from a fresh state
this.fileInput.value = null;
}}
+
+ // We are stopping the event propagation because triggering the `click()` on the hidden input
+ // causes the event to unexpectedly bubble up to anything wrapping this component e.g. Pressable
+ onClick={e => e.stopPropagation()}
accept={getAcceptableFileTypes(this.props.type)}
/>
{this.props.children({