From 3f85e10b1a5dd727e2094a895b84d5d773c52da4 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 18 Sep 2025 10:45:56 +0000 Subject: [PATCH 1/3] Update version to 9.2.15-10 (cherry picked from commit bb8e6d11a948002a08b629d83ca60640ecf2c2b7) (cherry-picked to staging by mountiny) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- ios/ShareViewController/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 b216187bcbeb..f3e39d16ac2d 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 1009021509 - versionName "9.2.15-9" + versionCode 1009021510 + versionName "9.2.15-10" // 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 e11c7e80758c..713255cec8a7 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.2.15.9 + 9.2.15.10 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index d1a658477115..8b207adf5314 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.2.15 CFBundleVersion - 9.2.15.9 + 9.2.15.10 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index 55ea9545f029..0e221bff69eb 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.2.15 CFBundleVersion - 9.2.15.9 + 9.2.15.10 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index 93c388b62255..2ecf147c5c79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.2.15-9", + "version": "9.2.15-10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.2.15-9", + "version": "9.2.15-10", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 7aa5900431d1..225b91db4ee9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.2.15-9", + "version": "9.2.15-10", "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 83a3a59b7d9184e80c7b7308e881b51121fbda8a Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 18 Sep 2025 10:46:37 +0000 Subject: [PATCH 2/3] Update Mobile-Expensify submodule version to 9.2.15-10 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index fb4966b1886a..4db9058efd39 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit fb4966b1886a64d1a3761098ba3a9ed202d8a9e9 +Subproject commit 4db9058efd39c3accd0cef528552d3b86187320b From 4cf736e552b20620839c9b1e93359cf514d3c37c Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Wed, 17 Sep 2025 23:36:07 +0200 Subject: [PATCH 3/3] Merge pull request #70752 from nkdengineer/fix/70607 [CP Staging] fix: View Button Unresponsive After Migration (cherry picked from commit 9869d62e8996c10dc2e0434df32171a3c9d40dd5) (cherry-picked to staging by mountiny) --- .../SelectionList/Search/TransactionGroupListItem.tsx | 2 +- src/components/SelectionList/types.ts | 2 +- src/libs/SearchUIUtils.ts | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/SelectionList/Search/TransactionGroupListItem.tsx b/src/components/SelectionList/Search/TransactionGroupListItem.tsx index ea4791a26984..4c6ef6810f4e 100644 --- a/src/components/SelectionList/Search/TransactionGroupListItem.tsx +++ b/src/components/SelectionList/Search/TransactionGroupListItem.tsx @@ -171,7 +171,7 @@ function TransactionGroupListItem({ setActiveTransactionThreadIDs(siblingTransactionThreadIDs).then(() => { // If we're trying to open a transaction without a transaction thread, let's create the thread and navigate the user if (transactionItem.transactionThreadReportID === CONST.REPORT.UNREPORTED_REPORT_ID) { - const iouAction = getReportAction(transactionItem.report.reportID, transactionItem.moneyRequestReportActionID); + const iouAction = getReportAction(transactionItem.report?.reportID, transactionItem.moneyRequestReportActionID); createAndOpenSearchTransactionThread(transactionItem, iouAction, currentSearchHash, backTo); return; } diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts index d271b23ebe92..18915d3c0c7c 100644 --- a/src/components/SelectionList/types.ts +++ b/src/components/SelectionList/types.ts @@ -235,7 +235,7 @@ type ListItem = { type TransactionListItemType = ListItem & SearchTransaction & { /** Report to which the transaction belongs */ - report: Report; + report: Report | undefined; /** The personal details of the user requesting money */ from: SearchPersonalDetails; diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 1c5e96f7a237..86437d383996 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -1242,8 +1242,9 @@ function getTaskSections( /** Creates transaction thread report and navigates to it from the search page */ function createAndOpenSearchTransactionThread(item: TransactionListItemType, iouReportAction: OnyxEntry, hash: number, backTo: string) { // We know that iou report action exists, but it wasn't loaded yet. We need to load iou report to have the necessary data in the onyx. - if (!iouReportAction) { - openReport(item.report.reportID); + const iouReportID = item.report?.reportID ?? item.reportID; + if (!iouReportAction && iouReportID && iouReportID !== CONST.REPORT.UNREPORTED_REPORT_ID) { + openReport(iouReportID); } const transactionThreadReport = createTransactionThreadReport(item.report, iouReportAction ?? ({reportActionID: item.moneyRequestReportActionID} as OnyxTypes.ReportAction)); if (transactionThreadReport?.reportID) {