Merge pull request #42869 from Expensify/luacmartins-cherry-pick-stag…

…ing-42805-1

🍒 Cherry pick PR #42805 to staging 🍒

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001047709
- versionName "1.4.77-9"
+ versionCode 1001047711
+ versionName "1.4.77-11"
  // 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"

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>1.4.77.9</string>
+ <string>1.4.77.11</string>
  <key>FullStory</key>
  <dict>
  <key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>1.4.77.9</string>
+ <string>1.4.77.11</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
  <key>CFBundleShortVersionString</key>
  <string>1.4.77</string>
  <key>CFBundleVersion</key>
- <string>1.4.77.9</string>
+ <string>1.4.77.11</string>
  <key>NSExtension</key>
  <dict>
  <key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
  "name": "new.expensify",
- "version": "1.4.77-9",
+ "version": "1.4.77-11",
  "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.",

src/components/SelectionList/BaseSelectionList.tsx

@@ -426,8 +426,7 @@ function BaseSelectionList<TItem extends ListItem>(
  shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  // We're already handling the Enter key press in the useKeyboardShortcut hook, so we don't want the list item to submit the form
  shouldPreventEnterKeySubmit
- // Change this because of lint
- rightHandSideComponent={rightHandSideComponent && (typeof rightHandSideComponent === 'function' ? rightHandSideComponent({} as TItem) : rightHandSideComponent)}
+ rightHandSideComponent={rightHandSideComponent}
  keyForList={item.keyForList ?? ''}
  isMultilineSupported={isRowMultilineSupported}
  onFocus={() => {

src/libs/ReportUtils.ts

@@ -81,7 +81,7 @@ import * as ReportActionsUtils from './ReportActionsUtils';
 import StringUtils from './StringUtils';
 import * as TransactionUtils from './TransactionUtils';
 import * as Url from './Url';
-import type * as UserUtils from './UserUtils';
+import type {AvatarSource} from './UserUtils';
 
 type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;
 
@@ -117,7 +117,7 @@ type SpendBreakdown = {
  totalDisplaySpend: number;
 };
 
-type ParticipantDetails = [number, string, UserUtils.AvatarSource, UserUtils.AvatarSource];
+type ParticipantDetails = [number, string, AvatarSource, AvatarSource];
 
 type OptimisticAddCommentReportAction = Pick<
  ReportAction,
@@ -587,7 +587,7 @@ function getLastUpdatedReport(): OnyxEntry<Report> {
  return lastUpdatedReport;
 }
 
-function getCurrentUserAvatar(): UserUtils.AvatarSource | undefined {
+function getCurrentUserAvatar(): AvatarSource | undefined {
  return currentUserPersonalDetails?.avatar;
 }
 
@@ -1714,7 +1714,7 @@ function getDefaultWorkspaceAvatarTestID(workspaceName: string): string {
  return !alphaNumeric ? defaultAvatarBuildingIconTestID : `SvgDefaultAvatar_${alphaNumeric[0]} Icon`;
 }
 
-function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
+function getWorkspaceAvatar(report: OnyxEntry<Report>): AvatarSource {
  const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
  const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL ?? '';
  return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName);
@@ -1921,7 +1921,7 @@ function getParticipants(reportID: string) {
 function getIcons(
  report: OnyxEntry<Report>,
  personalDetails: OnyxCollection<PersonalDetails>,
- defaultIcon: UserUtils.AvatarSource | null = null,
+ defaultIcon: AvatarSource | null = null,
  defaultName = '',
  defaultAccountID = -1,
  policy: OnyxEntry<Policy> = null,