fix: merge main

.github/workflows/testBuild.yml

@@ -281,7 +281,8 @@ jobs:
           content_android="${content_android//'%'/'%25'}"
           content_android="${content_android//$'\n'/'%0A'}"
           content_android="${content_android//$'\r'/'%0D'}"
-          echo "android_paths=$content_android" >> "$GITHUB_OUTPUT"
+          android_path=$(echo "$content_android" | jq -r '.html_path')
+          echo "android_path=$android_path" >> "$GITHUB_OUTPUT"
 
       - name: Read JSONs with iOS paths
         id: get_ios_path
@@ -291,7 +292,8 @@ jobs:
           content_ios="${content_ios//'%'/'%25'}"
           content_ios="${content_ios//$'\n'/'%0A'}"
           content_ios="${content_ios//$'\r'/'%0D'}"
-          echo "ios_paths=$content_ios" >> "$GITHUB_OUTPUT"
+          ios_path=$(echo "$content_ios" | jq -r '.html_path')
+          echo "ios_path=$ios_path" >> "$GITHUB_OUTPUT"
 
       # This step removes previous comments with links connected to the PR
       - name: maintain-comment
@@ -313,7 +315,7 @@ jobs:
           DESKTOP: ${{ needs.desktop.result }}
           IOS: ${{ needs.iOS.result }}
           WEB: ${{ needs.web.result }}
-          ANDROID_LINK: ${{fromJson(steps.get_android_path.outputs.android_paths).html_path}}
+          ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
           DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
-          IOS_LINK: ${{ fromJson(steps.get_ios_path.outputs.ios_paths).html_path }}
+          IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
           WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com

package.json

@@ -77,6 +77,7 @@
     "htmlparser2": "^7.2.0",
     "jest-when": "^3.5.2",
     "localforage": "^1.10.0",
+    "localforage-removeitems": "^1.4.0",
     "lodash": "4.17.21",
     "lottie-react-native": "^5.1.5",
     "metro-config": "^0.71.3",
@@ -106,7 +107,7 @@
     "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#6b5ab5110dc3ed554f8eafbc38d7d87c17147972",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.38",
+    "react-native-onyx": "1.0.39",
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^4.0.0",
     "react-native-permissions": "^3.0.1",

src/components/AddressSearch/index.js

@@ -13,6 +13,7 @@ import * as GooglePlacesUtils from '../../libs/GooglePlacesUtils';
 import CONST from '../../CONST';
 import * as StyleUtils from '../../styles/StyleUtils';
 import resetDisplayListViewBorderOnBlur from './resetDisplayListViewBorderOnBlur';
+import variables from '../styles/variables';
 
 // The error that's being thrown below will be ignored until we fork the
 // react-native-google-places-autocomplete repo and replace the
@@ -265,7 +266,7 @@ const AddressSearch = (props) => {
                     styles={{
                         textInputContainer: [styles.flexColumn],
                         listView: [
-                            StyleUtils.getGoolgeListViewStyle(displayListViewBorder),
+                            StyleUtils.getGoogleListViewStyle(displayListViewBorder),
                             styles.overflowAuto,
                             styles.borderLeft,
                             styles.borderRight,
@@ -283,8 +284,7 @@ const AddressSearch = (props) => {
                     onLayout={(event) => {
                         // We use the height of the element to determine if we should hide the border of the listView dropdown
                         // to prevent a lingering border when there are no address suggestions.
-                        // The height of the empty element is 2px (1px height for each top and bottom borders)
-                        setDisplayListViewBorder(event.nativeEvent.layout.height > 2);
+                        setDisplayListViewBorder(event.nativeEvent.layout.height > variables.googleEmptyListViewHeight);
                     }}
                 />
             </View>

src/components/OptionsList/BaseOptionsList.js

@@ -195,8 +195,8 @@ class BaseOptionsList extends Component {
                 // We do this so that we can reference the height in `getItemLayout` –
                 // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
                 // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-                <View style={styles.optionsListSectionHeader}>
-                    <Text style={[styles.p5, styles.textLabelSupporting]}>
+                <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter]}>
+                    <Text style={[styles.ph5, styles.textLabelSupporting]}>
                         {title}
                     </Text>
                 </View>

src/libs/Network/NetworkStore.js

@@ -151,4 +151,5 @@ export {
     isAuthenticating,
     setIsAuthenticating,
     getCredentials,
+    checkRequiredData,
 };

src/styles/StyleUtils.js

@@ -991,7 +991,7 @@ function getDirectionStyle(direction) {
  * @param {Boolean} shouldDisplayBorder
  * @returns {Object}
  */
-function getGoolgeListViewStyle(shouldDisplayBorder) {
+function getGoogleListViewStyle(shouldDisplayBorder) {
     if (shouldDisplayBorder) {
         return {
             ...styles.borderTopRounded,
@@ -1059,5 +1059,5 @@ export {
     getDirectionStyle,
     getFontSizeStyle,
     getSignInWordmarkWidthStyle,
-    getGoolgeListViewStyle,
+    getGoogleListViewStyle,
 };

src/styles/variables.js

@@ -127,4 +127,8 @@ export default {
     signInLogoWidthPill: 132,
     signInLogoWidthLargeScreenPill: 162,
     modalContentMaxWidth: 360,
+
+    // The height of the empty list is 14px (2px for borders and 12px for vertical padding)
+    // This is calculated based on the values specified in the 'getGoogleListViewStyle' function of the 'StyleUtils' utility
+    googleEmptyListViewHeight: 14,
 };

tests/unit/NetworkTest.js

@@ -32,6 +32,7 @@ beforeEach(() => {
     MainQueue.clear();
     HttpUtils.cancelPendingRequests();
     PersistedRequests.clear();
+    NetworkStore.checkRequiredData();
 
     // Wait for any Log command to finish and Onyx to fully clear
     jest.advanceTimersByTime(CONST.NETWORK.PROCESS_REQUEST_DELAY_MS);