Skip to content

Commit

Permalink
Merge pull request #44895 from Expensify/mountiny-cherry-pick-staging…
Browse files Browse the repository at this point in the history
…-44882-1

🍒 Cherry pick PR #44882 to staging 🍒
  • Loading branch information
mountiny authored Jul 5, 2024
2 parents 2bee9af + 16c2f53 commit c639a95
Showing 8 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -107,8 +107,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1009000405
versionName "9.0.4-5"
versionCode 1009000406
versionName "9.0.4-6"
// 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"
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.0.4.5</string>
<string>9.0.4.6</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.0.4.5</string>
<string>9.0.4.6</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.0.4</string>
<key>CFBundleVersion</key>
<string>9.0.4.5</string>
<string>9.0.4.6</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
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.0.4-5",
"version": "9.0.4-6",
"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.",
2 changes: 1 addition & 1 deletion src/components/SelectionList/BaseSelectionList.tsx
Original file line number Diff line number Diff line change
@@ -166,7 +166,7 @@ function BaseSelectionList<TItem extends ListItem>(
itemLayouts.push({length: fullItemHeight, offset});
offset += fullItemHeight;

if (item.isSelected && !selectedOptions.find((option) => option.text === item.text)) {
if (item.isSelected && !selectedOptions.find((option) => option.keyForList === item.keyForList)) {
selectedOptions.push(item);
}
});
1 change: 1 addition & 0 deletions src/libs/SearchUtils.ts
Original file line number Diff line number Diff line change
@@ -167,6 +167,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx

reportIDToTransactions[reportKey] = {
...value,
keyForList: value.reportID,
transactions,
};
} else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {

0 comments on commit c639a95

Please sign in to comment.