Merge branch 'main' into srikar-bumpCommonAndMarkdown

merge main
Expensify · Jun 19, 2024 · 3278123 · 3278123
2 parents 8e757e0 + de66757
commit 3278123
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 192 deletions.
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -16,7 +16,7 @@ import './fonts.css';
 Onyx.init({
     keys: ONYXKEYS,
     initialKeyStates: {
-        [ONYXKEYS.NETWORK]: {isOffline: false, isBackendReachable: true},
+        [ONYXKEYS.NETWORK]: {isOffline: false},
     },
 });
 

diff --git a/src/CONST.ts b/src/CONST.ts
@@ -561,10 +561,8 @@ const CONST = {
     EMPTY_ARRAY,
     EMPTY_OBJECT,
     USE_EXPENSIFY_URL,
-    STATUS_EXPENSIFY_URL: 'https://status.expensify.com',
     GOOGLE_MEET_URL_ANDROID: 'https://meet.google.com',
     GOOGLE_DOC_IMAGE_LINK_MATCH: 'googleusercontent.com',
-    GOOGLE_CLOUD_URL: 'https://clients3.google.com/generate_204',
     IMAGE_BASE64_MATCH: 'base64',
     DEEPLINK_BASE_URL: 'new-expensify://',
     PDF_VIEWER_URL: '/pdf/web/viewer.html',
@@ -1061,7 +1059,7 @@ const CONST = {
         MAX_RETRY_WAIT_TIME_MS: 10 * 1000,
         PROCESS_REQUEST_DELAY_MS: 1000,
         MAX_PENDING_TIME_MS: 10 * 1000,
-        BACKEND_CHECK_INTERVAL_MS: 60 * 1000,
+        RECHECK_INTERVAL_MS: 60 * 1000,
         MAX_REQUEST_RETRIES: 10,
         NETWORK_STATUS: {
             ONLINE: 'online',
@@ -1073,7 +1071,7 @@ const CONST = {
     DEFAULT_TIME_ZONE: {automatic: true, selected: 'America/Los_Angeles'},
     DEFAULT_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
     DEFAULT_CLOSE_ACCOUNT_DATA: {errors: null, success: '', isLoading: false},
-    DEFAULT_NETWORK_DATA: {isOffline: false, isBackendReachable: true},
+    DEFAULT_NETWORK_DATA: {isOffline: false},
     FORMS: {
         LOGIN_FORM: 'LoginForm',
         VALIDATE_CODE_FORM: 'ValidateCodeForm',

diff --git a/src/Expensify.tsx b/src/Expensify.tsx
@@ -146,10 +146,10 @@ function Expensify({
         // Initialize this client as being an active client
         ActiveClientManager.init();
 
-        // Used for the offline indicator appearing when someone is offline or backend is unreachable
-        const unsubscribeNetworkStatus = NetworkConnection.subscribeToNetworkStatus();
+        // Used for the offline indicator appearing when someone is offline
+        const unsubscribeNetInfo = NetworkConnection.subscribeToNetInfo();
 
-        return () => unsubscribeNetworkStatus();
+        return unsubscribeNetInfo;
     }, []);
 
     useEffect(() => {

diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx b/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
@@ -1,6 +1,6 @@
 import React, {forwardRef, useMemo} from 'react';
 import type {FlatListProps, ScrollViewProps, ViewToken} from 'react-native';
-import {FlatList} from 'react-native';
+import {DeviceEventEmitter, FlatList} from 'react-native';
 import type {ReportAction} from '@src/types/onyx';
 
 type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
@@ -9,16 +9,13 @@ type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
 
 const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
 
-let localViewableItems: ViewToken[];
-const getViewableItems = () => localViewableItems;
-
 function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.ForwardedRef<FlatList<ReportAction>>) {
     const {shouldEnableAutoScrollToTopThreshold, ...rest} = props;
 
     const handleViewableItemsChanged = useMemo(
         () =>
             ({viewableItems}: {viewableItems: ViewToken[]}) => {
-                localViewableItems = viewableItems;
+                DeviceEventEmitter.emit('onViewableItemsChanged', viewableItems);
             },
         [],
     );
@@ -51,4 +48,3 @@ function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.Fo
 BaseInvertedFlatListE2e.displayName = 'BaseInvertedFlatListE2e';
 
 export default forwardRef(BaseInvertedFlatListE2e);
-export {getViewableItems};
diff --git a/src/components/OfflineIndicator.tsx b/src/components/OfflineIndicator.tsx
@@ -7,11 +7,9 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
-import CONST from '@src/CONST';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
-import TextLink from './TextLink';
 
 type OfflineIndicatorProps = {
     /** Optional styles for container element that will override the default styling for the offline indicator */
@@ -25,7 +23,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isOffline, isBackendReachable} = useNetwork();
+    const {isOffline} = useNetwork();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const computedStyles = useMemo((): StyleProp<ViewStyle> => {
@@ -36,7 +34,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
         return shouldUseNarrowLayout ? styles.offlineIndicatorMobile : styles.offlineIndicator;
     }, [containerStyles, shouldUseNarrowLayout, styles.offlineIndicatorMobile, styles.offlineIndicator]);
 
-    if (!isOffline && isBackendReachable) {
+    if (!isOffline) {
         return null;
     }
 
@@ -48,22 +46,7 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
                 width={variables.iconSizeSmall}
                 height={variables.iconSizeSmall}
             />
-            <Text style={[styles.ml3, styles.chatItemComposeSecondaryRowSubText]}>
-                {isOffline ? (
-                    translate('common.youAppearToBeOffline')
-                ) : (
-                    <>
-                        {translate('common.weMightHaveProblem')}
-                        <TextLink
-                            href={CONST.STATUS_EXPENSIFY_URL}
-                            style={[styles.chatItemComposeSecondaryRowSubText, styles.link]}
-                        >
-                            {new URL(CONST.STATUS_EXPENSIFY_URL).host}
-                        </TextLink>
-                        .
-                    </>
-                )}
-            </Text>
+            <Text style={[styles.ml3, styles.chatItemComposeSecondaryRowSubText]}>{translate('common.youAppearToBeOffline')}</Text>
         </View>
     );
 }

diff --git a/src/hooks/useNetwork.ts b/src/hooks/useNetwork.ts
@@ -6,14 +6,13 @@ type UseNetworkProps = {
     onReconnect?: () => void;
 };
 
-type UseNetwork = {isOffline: boolean; isBackendReachable: boolean};
+type UseNetwork = {isOffline: boolean};
 
 export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {}): UseNetwork {
     const callback = useRef(onReconnect);
     callback.current = onReconnect;
 
-    const {isOffline, networkStatus, isBackendReachable} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
-    const isNetworkStatusUnknown = networkStatus === CONST.NETWORK.NETWORK_STATUS.UNKNOWN;
+    const {isOffline, networkStatus} = useContext(NetworkContext) ?? {...CONST.DEFAULT_NETWORK_DATA, networkStatus: CONST.NETWORK.NETWORK_STATUS.UNKNOWN};
     const prevOfflineStatusRef = useRef(isOffline);
     useEffect(() => {
         // If we were offline before and now we are not offline then we just reconnected
@@ -30,6 +29,6 @@ export default function useNetwork({onReconnect = () => {}}: UseNetworkProps = {
         prevOfflineStatusRef.current = isOffline;
     }, [isOffline]);
 
-    // If the network status is unknown, we fallback to default state, i.e. we're online and backend is reachable.
-    return isNetworkStatusUnknown ? CONST.DEFAULT_NETWORK_DATA : {isOffline, isBackendReachable};
+    // If the network status is undefined, we don't treat it as offline. Otherwise, we utilize the isOffline prop.
+    return {isOffline: networkStatus === CONST.NETWORK.NETWORK_STATUS.UNKNOWN ? false : isOffline};
 }
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -273,7 +273,6 @@ export default {
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
         youAppearToBeOffline: 'You appear to be offline.',
-        weMightHaveProblem: 'We might have a problem. Check out ',
         thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
         attachementWillBeAvailableOnceBackOnline: 'Attachment will become available once back online.',
         areYouSure: 'Are you sure?',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -264,7 +264,6 @@ export default {
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
         youAppearToBeOffline: 'Parece que estás desconectado.',
-        weMightHaveProblem: 'Peude que te tengamos un problema. Echa un vistazo a ',
         thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
         attachementWillBeAvailableOnceBackOnline: 'El archivo adjunto estará disponible cuando vuelvas a estar en línea.',
         areYouSure: '¿Estás seguro?',

diff --git a/src/libs/E2E/tests/linkingTest.e2e.ts b/src/libs/E2E/tests/linkingTest.e2e.ts
@@ -1,11 +1,12 @@
+import {DeviceEventEmitter} from 'react-native';
 import type {NativeConfig} from 'react-native-config';
 import Config from 'react-native-config';
-import {getViewableItems} from '@components/InvertedFlatList/BaseInvertedFlatList/index.e2e';
 import Timing from '@libs/actions/Timing';
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
 import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded';
 import E2EClient from '@libs/E2E/client';
 import getConfigValueOrThrow from '@libs/E2E/utils/getConfigValueOrThrow';
+import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import CONST from '@src/CONST';
@@ -23,6 +24,29 @@ const test = (config: NativeConfig) => {
             return waitForAppLoaded().then(() => E2EClient.submitTestDone());
         }
 
+        const [appearMessagePromise, appearMessageResolve] = getPromiseWithResolve();
+        const [switchReportPromise, switchReportResolve] = getPromiseWithResolve();
+
+        Promise.all([appearMessagePromise, switchReportPromise])
+            .then(() => {
+                console.debug('[E2E] Test completed successfully, exiting…');
+                E2EClient.submitTestDone();
+            })
+            .catch((err) => {
+                console.debug('[E2E] Error while submitting test results:', err);
+            });
+
+        const subscription = DeviceEventEmitter.addListener('onViewableItemsChanged', (res) => {
+            console.debug('[E2E] Viewable items retrieved, verifying correct message…', res);
+
+            if (!!res && res[0]?.item?.reportActionID === linkedReportActionID) {
+                appearMessageResolve();
+                subscription.remove();
+            } else {
+                console.debug(`[E2E] Provided message id '${res?.[0]?.item?.reportActionID}' doesn't match to an expected '${linkedReportActionID}'. Waiting for a next one…`);
+            }
+        });
+
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
                 console.debug('[E2E] Sidebar loaded, navigating to a report…');
@@ -41,27 +65,14 @@ const test = (config: NativeConfig) => {
 
             if (entry.name === CONST.TIMING.SWITCH_REPORT) {
                 console.debug('[E2E] Linking: 1');
-                setTimeout(() => {
-                    const res = getViewableItems();
-                    console.debug('[E2E] Viewable items retrieved, verifying correct message…');
 
-                    if (!!res && res[0]?.item?.reportActionID === linkedReportActionID) {
-                        E2EClient.submitTestResults({
-                            branch: Config.E2E_BRANCH,
-                            name: 'Comment linking',
-                            duration: entry.duration,
-                        })
-                            .then(() => {
-                                console.debug('[E2E] Test completed successfully, exiting…');
-                                E2EClient.submitTestDone();
-                            })
-                            .catch((err) => {
-                                console.debug('[E2E] Error while submitting test results:', err);
-                            });
-                    } else {
-                        console.debug('[E2E] Message verification failed');
-                    }
-                }, 3000);
+                E2EClient.submitTestResults({
+                    branch: Config.E2E_BRANCH,
+                    name: 'Comment linking',
+                    duration: entry.duration,
+                });
+
+                switchReportResolve();
             }
         });
     });