Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Mobile-Expensify
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.2.15.9</string>
<string>9.2.15.10</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.2.15</string>
<key>CFBundleVersion</key>
<string>9.2.15.9</string>
<string>9.2.15.10</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ShareViewController/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.2.15</string>
<key>CFBundleVersion</key>
<string>9.2.15.9</string>
<string>9.2.15.10</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function TransactionGroupListItem<TItem extends ListItem>({
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);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the conflict, the lines are moved around in main

createAndOpenSearchTransactionThread(transactionItem, iouAction, currentSearchHash, backTo);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SelectionList/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ type ListItem<K extends string | number = string> = {
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;
Expand Down
5 changes: 3 additions & 2 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1242,8 +1242,9 @@ function getTaskSections(
/** Creates transaction thread report and navigates to it from the search page */
function createAndOpenSearchTransactionThread(item: TransactionListItemType, iouReportAction: OnyxEntry<OnyxTypes.ReportAction>, 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) {
Expand Down