From 39d4d8fb78f3f1c3541ef16584db98bf3b92c22b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 3 Feb 2023 16:54:23 -0500
Subject: [PATCH 1/2] Merge pull request #14824 from
Expensify/version-BUILD-018021A2-11D7-4943-ABC6-87EC85DEE0EE
Update version to 1.2.64-6 on main
(cherry picked from commit db7795776fdf374f16e469053fcd9fb81ebaf81e)
---
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 44c54fc1769d..41899907b97b 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 1001026405
- versionName "1.2.64-5"
+ versionCode 1001026406
+ versionName "1.2.64-6"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f636b900fcea..94094f6e277c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.64.5
+ 1.2.64.6
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 206d3dd49774..0fce1624eeaa 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.64.5
+ 1.2.64.6
diff --git a/package-lock.json b/package-lock.json
index 838d5e9f93e9..bcb53696fdd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.64-5",
+ "version": "1.2.64-6",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.64-5",
+ "version": "1.2.64-6",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 578ea08f9fcb..6902501e965c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.64-5",
+ "version": "1.2.64-6",
"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 10d6cdb06a00588a7c8d7753bc351c458005c803 Mon Sep 17 00:00:00 2001
From: Jack Nam <30609178+thienlnam@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:47:44 -0800
Subject: [PATCH 2/2] Merge pull request #14823 from
Pujan92/fix/upload-profile-pic-14757
(cherry picked from commit 2a8e6a83a3ae5246e426c4a867518f2a91945fbe)
---
src/components/AttachmentPicker/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/AttachmentPicker/index.js b/src/components/AttachmentPicker/index.js
index dddceb7cf7df..dc6573e02c20 100644
--- a/src/components/AttachmentPicker/index.js
+++ b/src/components/AttachmentPicker/index.js
@@ -36,10 +36,10 @@ class AttachmentPicker extends React.Component {
if (file) {
const cleanName = FileUtils.cleanFileName(file.name);
- file.uri = URL.createObjectURL(file);
if (file.name !== cleanName) {
file = new File([file], cleanName);
}
+ file.uri = URL.createObjectURL(file);
this.onPicked(file);
}