Merge branch 'main' of github.com:Expensify/App into nikki-update-onb…

…oarding-message

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047404
-        versionName "1.4.74-4"
+        versionCode 1001047500
+        versionName "1.4.75-0"
         // 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

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.74</string>
+	<string>1.4.75</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.74.4</string>
+	<string>1.4.75.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.74</string>
+	<string>1.4.75</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.74.4</string>
+	<string>1.4.75.0</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.74</string>
+	<string>1.4.75</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.74.4</string>
+	<string>1.4.75.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

@@ -1831,7 +1831,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.69):
+  - RNLiveMarkdown (0.1.70):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1849,9 +1849,9 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.69)
+    - RNLiveMarkdown/common (= 0.1.70)
     - Yoga
-  - RNLiveMarkdown/common (0.1.69):
+  - RNLiveMarkdown/common (0.1.70):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2556,7 +2556,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184
+  RNLiveMarkdown: 23250f3d64c9d5f82ff36c4733c03544af0222d2
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c
   RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.74-4",
+  "version": "1.4.75-0",
   "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.",
@@ -108,7 +108,7 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#9a68635cdcef4c81593c0f816a007bc9c707d46a",
+    "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#1713f28214f0e7176c4fd13433fb0ea15491ebf9",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
     "expo-image": "1.11.0",
@@ -152,7 +152,7 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "2.0.32",
+    "react-native-onyx": "2.0.41",
     "react-native-pager-view": "6.2.3",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",
@@ -177,7 +177,7 @@
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-sound": "^0.1.3",
     "react-native-webview": "13.6.4",
-    "react-pdf": "^7.7.0",
+    "react-pdf": "^7.7.3",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
     "react-webcam": "^7.1.1",
@@ -290,7 +290,7 @@
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "type-fest": "^4.10.2",
-    "typescript": "^5.3.2",
+    "typescript": "^5.4.5",
     "wait-port": "^0.2.9",
     "webpack": "^5.76.0",
     "webpack-bundle-analyzer": "^4.5.0",
@@ -330,4 +330,4 @@
     "node": "20.13.0",
     "npm": "10.5.2"
   }
-}
+}

src/components/AddressForm.tsx

@@ -4,7 +4,6 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import type {MaybePhraseKey} from '@libs/Localize';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
@@ -149,8 +148,6 @@ function AddressForm({
                     label={translate('common.addressLine', {lineNumber: 1})}
                     onValueChange={(data: unknown, key: unknown) => {
                         onAddressChanged(data, key);
-                        // This enforces the country selector to use the country from address instead of the country from URL
-                        Navigation.setParams({country: undefined});
                     }}
                     defaultValue={street1}
                     renamedInputKeys={{

src/components/AttachmentModal.tsx

@@ -607,7 +607,6 @@ export default withOnyx<AttachmentModalProps, AttachmentModalOnyxProps>({
             const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage.IOUTransactionID ?? '0' : '0';
             return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
         },
-        initWithStoredValues: false,
     },
 })(memo(AttachmentModal));
 

src/components/AvatarWithDisplayName.tsx

@@ -1,6 +1,6 @@
 import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -12,7 +12,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetails, Policy, Report, ReportActions} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, Policy, Report, ReportActions} from '@src/types/onyx';
 import DisplayNames from './DisplayNames';
 import MultipleAvatars from './MultipleAvatars';
 import ParentNavigationSubtitle from './ParentNavigationSubtitle';
@@ -25,7 +25,7 @@ type AvatarWithDisplayNamePropsWithOnyx = {
     parentReportActions: OnyxEntry<ReportActions>;
 
     /** Personal details of all users */
-    personalDetails: OnyxCollection<PersonalDetails>;
+    personalDetails: OnyxEntry<PersonalDetailsList>;
 };
 
 type AvatarWithDisplayNameProps = AvatarWithDisplayNamePropsWithOnyx & {

src/components/KeyboardAvoidingView/index.ios.tsx

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading

src/components/KeyboardAvoidingView/index.tsx

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {View} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
     const {behavior, contentContainerStyle, enabled, keyboardVerticalOffset, ...rest} = props;

src/components/KeyboardAvoidingView/types.ts

@@ -1,3 +1,4 @@
-import {KeyboardAvoidingViewProps} from 'react-native';
+import type {KeyboardAvoidingViewProps} from 'react-native';
 
-export default KeyboardAvoidingViewProps;
+// eslint-disable-next-line import/prefer-default-export
+export type {KeyboardAvoidingViewProps};

src/components/LHNOptionsList/OptionRowLHN.tsx

@@ -58,13 +58,24 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
             : [styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRow, styles.justifyContentCenter],
     );
 
-    if (!optionItem) {
+    if (!optionItem && !isFocused) {
         // rendering null as a render item causes the FlashList to render all
-        // its children and consume signficant memory. We can avoid this by
-        // rendering a placeholder view instead.
+        // its children and consume signficant memory on the first render. We can avoid this by
+        // rendering a placeholder view instead. This behaviour is only observed when we
+        // first sign in to the App.
+        // We can fix this by checking if the optionItem is null and the component is not focused.
+        // Which means that the currentReportID is not the same as the reportID. The currentReportID
+        // in this case is empty and hence the component is not focused.
         return <View style={sidebarInnerRowStyle} />;
     }
 
+    if (!optionItem) {
+        // This is the case when the component is focused and the optionItem is null.
+        // For example, when you submit an expense in offline mode and click on the
+        // generated expense report, we would only see the Report Details but no item in LHN.
+        return null;
+    }
+
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const shouldShowGreenDotIndicator = !hasBrickError && ReportUtils.requiresAttentionFromCurrentUser(optionItem, optionItem.parentReportAction);
     const textStyle = isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;