From dfc27c0164196213ab242b5cbf5809b33168173b Mon Sep 17 00:00:00 2001 From: Linh Date: Fri, 7 Mar 2025 11:43:02 +0700 Subject: [PATCH 1/6] fix: unable hold expense from reports --- .../Navigation/helpers/isSearchTopmostFullScreenRoute.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/Navigation/helpers/isSearchTopmostFullScreenRoute.ts b/src/libs/Navigation/helpers/isSearchTopmostFullScreenRoute.ts index 43077d44ab2a..b324cc99718f 100644 --- a/src/libs/Navigation/helpers/isSearchTopmostFullScreenRoute.ts +++ b/src/libs/Navigation/helpers/isSearchTopmostFullScreenRoute.ts @@ -1,6 +1,6 @@ import {navigationRef} from '@libs/Navigation/Navigation'; import type {RootNavigatorParamList, State} from '@libs/Navigation/types'; -import SCREENS from '@src/SCREENS'; +import NAVIGATORS from '@src/NAVIGATORS'; import {isFullScreenName} from './isNavigatorName'; const isSearchTopmostFullScreenRoute = (): boolean => { @@ -9,8 +9,7 @@ const isSearchTopmostFullScreenRoute = (): boolean => { if (!rootState) { return false; } - - return rootState.routes.findLast((route) => isFullScreenName(route.name))?.name === SCREENS.SEARCH.ROOT; + return rootState.routes.findLast((route) => isFullScreenName(route.name))?.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR; }; export default isSearchTopmostFullScreenRoute; From e4f7684a221348df5ae309663fc8aed67378ff35 Mon Sep 17 00:00:00 2001 From: daledah Date: Fri, 7 Mar 2025 17:24:47 +0700 Subject: [PATCH 2/6] fix: refactor logics to show copy URL without reportID --- .../home/report/ContextMenu/BaseReportActionContextMenu.tsx | 1 - src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx index 0aead849c16f..a7f4a0202760 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx @@ -205,7 +205,6 @@ function BaseReportActionContextMenu({ let filteredContextMenuActions = ContextMenuActions.filter( (contextAction) => !disabledActions.includes(contextAction) && - reportID && contextAction.shouldShow({ type, reportAction, diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index fb45f60fb3c0..5cffa0fdbb1f 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -150,7 +150,7 @@ type ShouldShow = (args: { betas: OnyxEntry; menuTarget: MutableRefObject | undefined; isChronosReport: boolean; - reportID: string; + reportID?: string; isPinnedChat: boolean; isUnreadChat: boolean; isThreadReportParentAction: boolean; @@ -269,7 +269,7 @@ const ContextMenuActions: ContextMenuAction[] = [ textTranslateKey: 'reportActionContextMenu.replyInThread', icon: Expensicons.ChatBubbleReply, shouldShow: ({type, reportAction, reportID, isThreadReportParentAction}) => { - if (type !== CONST.CONTEXT_MENU_TYPES.REPORT_ACTION) { + if (type !== CONST.CONTEXT_MENU_TYPES.REPORT_ACTION || !reportID) { return false; } return !shouldDisableThread(reportAction, reportID, isThreadReportParentAction); @@ -755,6 +755,7 @@ const ContextMenuActions: ContextMenuAction[] = [ icon: Expensicons.Trashcan, shouldShow: ({type, reportAction, isArchivedRoom, isChronosReport, reportID, moneyRequestAction}) => // Until deleting parent threads is supported in FE, we will prevent the user from deleting a thread parent + !!reportID && type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION && canDeleteReportAction(moneyRequestAction ?? reportAction, reportID) && !isArchivedRoom && From 36a371944edf7d904f48bfa42db12d30c7a78292 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 7 Mar 2025 14:40:09 +0000 Subject: [PATCH 3/6] Update version to 9.1.10-1 --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f34acdd2855f..9112c4654901 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009011000 - versionName "9.1.10-0" + versionCode 1009011001 + versionName "9.1.10-1" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index a7b59e173424..298eaa346466 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.10.0 + 9.1.10.1 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 18597086467e..3d1201954404 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.1.10.0 + 9.1.10.1 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 323f5b5d62cc..b492e7646a93 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.10 CFBundleVersion - 9.1.10.0 + 9.1.10.1 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 4052598cf49e..cfcc8a0074bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.10-0", + "version": "9.1.10-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.10-0", + "version": "9.1.10-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index af82ad720618..4870dd61eeb2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.10-0", + "version": "9.1.10-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 c3983a076bf172abba94523ac3ba85592d9b15bd Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 7 Mar 2025 14:40:09 +0000 Subject: [PATCH 4/6] Update Mobile-Expensify submodule version to 9.1.10-1 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index 20e1d9c9ddb8..09e3b6a31cbc 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 20e1d9c9ddb828c40c07e9ca28f2eb29820adde9 +Subproject commit 09e3b6a31cbc853c34f70afa8d1247542277a281 From 6c47ee22d061e5d7d47df5068ffd3c84102e9130 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 7 Mar 2025 15:40:11 +0000 Subject: [PATCH 5/6] Update version to 9.1.10-2 --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 9112c4654901..f349aa6e28d4 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009011001 - versionName "9.1.10-1" + versionCode 1009011002 + versionName "9.1.10-2" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 298eaa346466..b287bce73b91 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.10.1 + 9.1.10.2 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3d1201954404..8a47f578e5b7 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.1.10.1 + 9.1.10.2 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index b492e7646a93..81d4962a1314 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.10 CFBundleVersion - 9.1.10.1 + 9.1.10.2 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index cfcc8a0074bf..93e67957448e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.10-1", + "version": "9.1.10-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.10-1", + "version": "9.1.10-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 4870dd61eeb2..44b0611c18cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.10-1", + "version": "9.1.10-2", "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 21f85e3beae163cc7068edb068b13d02a601992d Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 7 Mar 2025 15:40:11 +0000 Subject: [PATCH 6/6] Update Mobile-Expensify submodule version to 9.1.10-2 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index 09e3b6a31cbc..6526bd0611fb 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 09e3b6a31cbc853c34f70afa8d1247542277a281 +Subproject commit 6526bd0611fb7b0c7cc1bb22c436a0d854cbbe4f