From 12efa96cfcc9dcb5eeed94fb79bebdd289600de8 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 7 Nov 2022 16:34:01 -0500 Subject: [PATCH 1/2] Merge pull request #12538 from Expensify/version-BUILD-D0826747-43A3-4FFE-AA81-D79BA9B817D2 Update version to 1.2.24-4 on main (cherry picked from commit 4f92e57bb4fa08339527f8082f207f81628492d8) --- 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 e52dce1e0c10..c6001ca26cb2 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 1001022403 - versionName "1.2.24-3" + versionCode 1001022404 + versionName "1.2.24-4" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index f8a8e4faa0e7..1614c84de5f2 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.24.3 + 1.2.24.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 381e0e8fd377..f4241782e2fc 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.24.3 + 1.2.24.4 diff --git a/package-lock.json b/package-lock.json index 8d60592dd6c8..d1631e5957d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.24-3", + "version": "1.2.24-4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.24-3", + "version": "1.2.24-4", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 47f62e0498ae..0e2bb0d581f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.24-3", + "version": "1.2.24-4", "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 d4b06bcd35195195a6b8bf720c7fef90cae306a8 Mon Sep 17 00:00:00 2001 From: Marc Glasser Date: Mon, 7 Nov 2022 11:28:45 -1000 Subject: [PATCH 2/2] Merge pull request #12533 from 0xmiroslav/issue-12487 fix crash on profile detail (cherry picked from commit 9c64d6455ea38ffd1ae6d9df3a1be8e72cc34c94) --- src/pages/DetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index e65930c916dd..17ad4f971393 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -86,7 +86,7 @@ class DetailsPage extends React.PureComponent { const login = lodashGet(this.props.route.params, 'login'); details = { login, - displayName: ReportUtils.getDisplayNameForParticipant({login}), + displayName: ReportUtils.getDisplayNameForParticipant(login), avatar: ReportUtils.getDefaultAvatar(), }; }