From b2ab1f0a0f56d1bbb660179ace4be100e0638045 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 16 May 2023 09:40:03 -0400 Subject: [PATCH 1/2] Merge pull request #19013 from Expensify/version-BUILD-4442637B-6B83-44A6-BDB0-B60827F31CE2 Update version to 1.3.14-9 on main (cherry picked from commit c9d5cf35caeed9a9a3dad19749f642f2a7f54259) --- 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 1880ff21c011b..b8dbc338ee68f 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 1001031408 - versionName "1.3.14-8" + versionCode 1001031409 + versionName "1.3.14-9" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index eaf538dbf0cb0..b99259eed80d1 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.14.8 + 1.3.14.9 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 87babd8a6017b..1280516d99c16 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.14.8 + 1.3.14.9 diff --git a/package-lock.json b/package-lock.json index 9a53bb645f12c..8045ec325c78f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.14-8", + "version": "1.3.14-9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.14-8", + "version": "1.3.14-9", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index d2c55f7f5d055..b8eb857aec7bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.14-8", + "version": "1.3.14-9", "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 3feafae4533fe8f3950ef86ed9a01f91b2600ecf Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Tue, 16 May 2023 15:31:24 +0200 Subject: [PATCH 2/2] Merge pull request #18933 from PrashantMangukiya/prashant-fix-18882 Corrected - IOU Description extends beyond the page if recipient name is long (cherry picked from commit 1e58c6e018a5882066847eefd4e297a2a5231035) --- src/components/ReportActionItem/ReportPreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js index b643d2ae606be..add769e2cc505 100644 --- a/src/components/ReportActionItem/ReportPreview.js +++ b/src/components/ReportActionItem/ReportPreview.js @@ -113,7 +113,7 @@ const ReportPreview = (props) => { style={[styles.flexRow, styles.justifyContentBetween]} focusable > - + {props.iouReport.hasOutstandingIOU ? ( {props.translate('iou.payerOwesAmount', {payer: managerName, amount: reportAmount})} ) : (