Merge pull request #49581 from nyomanjyotisa/issue-48643

Fix: Previous waypoints displayed for a second before new suggestions appear
Expensify · Sep 23, 2024 · dcf1a0c · dcf1a0c
2 parents 215a2e8 + d400ccb
commit dcf1a0c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
@@ -94,6 +94,7 @@ function AddressSearch(
     const [locationErrorCode, setLocationErrorCode] = useState<GeolocationErrorCodeType>(null);
     const [isFetchingCurrentLocation, setIsFetchingCurrentLocation] = useState(false);
     const shouldTriggerGeolocationCallbacks = useRef(true);
+    const [shouldHidePredefinedPlaces, setShouldHidePredefinedPlaces] = useState(false);
     const containerRef = useRef<View>(null);
     const query = useMemo(
         () => ({
@@ -326,8 +327,11 @@ function AddressSearch(
         if (!searchValue) {
             return predefinedPlaces ?? [];
         }
+        if (shouldHidePredefinedPlaces) {
+            return [];
+        }
         return predefinedPlaces?.filter((predefinedPlace) => isPlaceMatchForSearch(searchValue, predefinedPlace)) ?? [];
-    }, [predefinedPlaces, searchValue]);
+    }, [predefinedPlaces, searchValue, shouldHidePredefinedPlaces]);
 
     const listEmptyComponent = useMemo(
         () => (!isTyping ? undefined : <Text style={[styles.textLabel, styles.colorMuted, styles.pv4, styles.ph3, styles.overflowAuto]}>{translate('common.noResultsFound')}</Text>),
@@ -429,6 +433,7 @@ function AddressSearch(
                             onInputChange: (text: string) => {
                                 setSearchValue(text);
                                 setIsTyping(true);
+                                setShouldHidePredefinedPlaces(!isOffline);
                                 if (inputID) {
                                     onInputChange?.(text);
                                 } else {