Merge branch 'main' into hold-request/educational-interstitial

merge main into hold-request/educational-interstitial

src/components/AddressSearch/index.js

@@ -197,7 +197,7 @@ function AddressSearch({
             // amount of data massaging needs to happen for what the parent expects to get from this function.
             if (_.size(details)) {
                 onPress({
-                    address: lodashGet(details, 'description'),
+                    address: autocompleteData.description || lodashGet(details, 'description', ''),
                     lat: lodashGet(details, 'geometry.location.lat', 0),
                     lng: lodashGet(details, 'geometry.location.lng', 0),
                     name: lodashGet(details, 'name'),
@@ -266,7 +266,7 @@ function AddressSearch({
 
             lat: lodashGet(details, 'geometry.location.lat', 0),
             lng: lodashGet(details, 'geometry.location.lng', 0),
-            address: lodashGet(details, 'formatted_address', ''),
+            address: autocompleteData.description || lodashGet(details, 'formatted_address', ''),
         };
 
         // If the address is not in the US, use the full length state name since we're displaying the address's

src/components/TimePicker/setCursorPosition/index.ios.ts

@@ -0,0 +1,13 @@
+import SetCursorPosition from './types';
+
+const setCursorPosition: SetCursorPosition = (position, ref, setSelection) => {
+    const selection = {
+        start: position,
+        end: position,
+    };
+    setSelection(selection);
+    ref.current?.focus();
+    ref.current?.setNativeProps({selection});
+};
+
+export default setCursorPosition;

src/components/TimePicker/setCursorPosition/index.ts

@@ -0,0 +1,11 @@
+import SetCursorPosition from './types';
+
+const setCursorPosition: SetCursorPosition = (position, ref, setSelection) => {
+    setSelection({
+        start: position,
+        end: position,
+    });
+    ref.current?.focus();
+};
+
+export default setCursorPosition;

src/components/TimePicker/setCursorPosition/types.ts

@@ -0,0 +1,6 @@
+import {RefObject} from 'react';
+import {TextInput} from 'react-native';
+
+type SetCursorPosition = (position: number, ref: RefObject<TextInput>, setSelection: (value: {start: number; end: number}) => void) => void;
+
+export default SetCursorPosition;

src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts

@@ -44,6 +44,11 @@ function ReportScreenIDSetter({route, reports, policies, navigation, isFirstTime
     useEffect(() => {
         // Don't update if there is a reportID in the params already
         if (route?.params?.reportID) {
+            const reportActionID = route?.params?.reportActionID;
+            const regexValidReportActionID = new RegExp(/^\d*$/);
+            if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
+                navigation.setParams({reportActionID: ''});
+            }
             App.confirmReadyToOpenApp();
             return;
         }

src/libs/actions/Policy.js

@@ -270,6 +270,10 @@ function buildAnnounceRoomMembersOnyxData(policyID, accountIDs) {
         onyxFailureData: [],
     };
 
+    if (!announceReport) {
+        return announceRoomMembers;
+    }
+
     announceRoomMembers.onyxOptimisticData.push({
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
@@ -301,6 +305,10 @@ function removeOptimisticAnnounceRoomMembers(policyID, accountIDs) {
         onyxFailureData: [],
     };
 
+    if (!announceReport) {
+        return announceRoomMembers;
+    }
+
     const remainUsers = _.difference(announceReport.participantAccountIDs, accountIDs);
     announceRoomMembers.onyxOptimisticData.push({
         onyxMethod: Onyx.METHOD.MERGE,