From 2d39149dabebc8ffae6ff6b97b0c3851f686c8a3 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 2 Sep 2022 07:59:38 -0400 Subject: [PATCH 1/2] Merge pull request #10795 from Expensify/version-BUILD-F117657F-16C2-405E-AF45-85931E3B254D Update version to 1.1.96-5 on main (cherry picked from commit b146c91428fb697cdc72aad31177932c7f8584c0) --- 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 f3acbfcca319..290476c54f3b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -155,8 +155,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001019604 - versionName "1.1.96-4" + versionCode 1001019605 + versionName "1.1.96-5" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index e5685ce548c0..6d6ec413b475 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.96.4 + 1.1.96.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 9b6b3ac0fc80..c3225b4aa115 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.96.4 + 1.1.96.5 diff --git a/package-lock.json b/package-lock.json index b66218953694..968bf6cf3fd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.1.96-4", + "version": "1.1.96-5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.1.96-4", + "version": "1.1.96-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 7f34ee49d6d2..ba3084b15665 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.96-4", + "version": "1.1.96-5", "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 76aad9837674bc2f946256276749b1f6a76490ad Mon Sep 17 00:00:00 2001 From: Paulo Gaspar Sena do Vale Date: Fri, 2 Sep 2022 13:53:34 +0200 Subject: [PATCH 2/2] Merge pull request #10780 from Expensify/paulogasparsv-delete-message-strike Show deleted messages with a strike-through when offline (cherry picked from commit 77e5843c6a928b135b993166c073841b21610781) --- src/libs/actions/Report.js | 7 +++---- src/pages/home/report/ReportActionItemFragment.js | 9 ++++++++- src/pages/home/report/ReportActionItemMessage.js | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index ce448bc0ed5d..ad2dd0c54dd2 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -1103,13 +1103,12 @@ Onyx.connect({ */ function deleteReportComment(reportID, reportAction) { const sequenceNumber = reportAction.sequenceNumber; + + // We are not updating the message content here so the message can re-appear as strike-throughed + // if the user goes offline. The API will update the message content to empty strings on success. const optimisticReportActions = { [sequenceNumber]: { pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - message: [{ - html: '', - text: '', - }], }, }; diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js index 4d4d444ffd81..3d8fdb9c6e35 100644 --- a/src/pages/home/report/ReportActionItemFragment.js +++ b/src/pages/home/report/ReportActionItemFragment.js @@ -51,6 +51,12 @@ const propTypes = { /** Should this fragment be contained in a single line? */ isSingleLine: PropTypes.bool, + // Additional styles to add after local styles + style: PropTypes.oneOfType([ + PropTypes.arrayOf(PropTypes.object), + PropTypes.object, + ]), + ...windowDimensionsPropTypes, /** localization props */ @@ -69,6 +75,7 @@ const defaultProps = { isSingleLine: false, tooltipText: '', source: '', + style: [], }; const ReportActionItemFragment = (props) => { @@ -119,7 +126,7 @@ const ReportActionItemFragment = (props) => { {StyleUtils.convertToLTR(Str.htmlDecode(text))} {props.fragment.isEdited && ( diff --git a/src/pages/home/report/ReportActionItemMessage.js b/src/pages/home/report/ReportActionItemMessage.js index 9cfa1e5eb537..a066b2be34f8 100644 --- a/src/pages/home/report/ReportActionItemMessage.js +++ b/src/pages/home/report/ReportActionItemMessage.js @@ -45,6 +45,7 @@ const ReportActionItemMessage = (props) => { attachmentInfo={props.action.attachmentInfo} source={lodashGet(props.action, 'originalMessage.source')} loading={props.action.isLoading} + style={props.style} /> ))}