Pull latest changes

Author: parasharrajat

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010803
-        versionName "1.1.8-3"
+        versionCode 1001010804
+        versionName "1.1.8-4"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.8.3</string>
+	<string>1.1.8.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.8.3</string>
+	<string>1.1.8.4</string>
 </dict>
 </plist>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.8-3",
+  "version": "1.1.8-4",
   "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.",

package.json

@@ -7,6 +7,7 @@ import {
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
+import Log from '../libs/Log';
 import PlaidLink from './PlaidLink';
 import {
     clearPlaidBankAccountsAndToken,
@@ -163,12 +164,12 @@ class AddPlaidBankAccount extends React.Component {
                     <PlaidLink
                         token={this.props.plaidLinkToken}
                         onSuccess={({publicToken, metadata}) => {
-                            console.debug('[PlaidLink] Success: ', {publicToken, metadata});
+                            Log.info('[PlaidLink] Success!');
                             getPlaidBankAccounts(publicToken, metadata.institution.name);
                             this.setState({institution: metadata.institution});
                         }}
                         onError={(error) => {
-                            console.debug(`Plaid Error: ${error.message}`);
+                            Log.hmmm('[PlaidLink] Error: ', error.message);
                         }}
 
                         // User prematurely exited the Plaid flow

src/components/AddPlaidBankAccount.js

@@ -1,6 +1,7 @@
 import React, {PureComponent} from 'react';
 import {Image} from 'react-native';
 import PropTypes from 'prop-types';
+import Log from '../libs/Log';
 import styles from '../styles/styles';
 
 const propTypes = {
@@ -63,7 +64,7 @@ class ImageWithSizeCalculation extends PureComponent {
 
             this.props.onMeasure({width, height});
         }, (error) => {
-            console.debug('Unable to fetch image to calculate size', {error});
+            Log.hmmm('Unable to fetch image to calculate size', {error, url: this.props.url});
         });
     }
 

src/components/ImageWithSizeCalculation.js

@@ -2,6 +2,7 @@ import _ from 'underscore';
 import React, {forwardRef, Component} from 'react';
 import {Keyboard, View} from 'react-native';
 import PropTypes from 'prop-types';
+import Log from '../libs/Log';
 import styles from '../styles/styles';
 import OptionRow from '../pages/home/sidebar/OptionRow';
 import optionPropTypes from './optionPropTypes';
@@ -154,7 +155,7 @@ class OptionsList extends Component {
      * @param {Object} info
      */
     onScrollToIndexFailed(info) {
-        console.debug(info);
+        Log.hmmm('[OptionsList] scrollToIndex failed', info);
     }
 
     /**

src/components/OptionsList.js

@@ -1,6 +1,7 @@
 import {useCallback, useEffect} from 'react';
 import {usePlaidLink} from 'react-plaid-link';
 import {plaidLinkPropTypes, plaidLinkDefaultProps} from './plaidLinkPropTypes';
+import Log from '../../libs/Log';
 
 const PlaidLink = (props) => {
     const onSuccess = useCallback((publicToken, metadata) => {
@@ -11,11 +12,11 @@ const PlaidLink = (props) => {
         token: props.token,
         onSuccess,
         onExit: (exitError, metadata) => {
-            console.debug('[PlaidLink] Exit: ', {exitError, metadata});
+            Log.info('[PlaidLink] Exit: ', false, {exitError, metadata});
             props.onExit();
         },
         onEvent: (event, metadata) => {
-            console.debug('[PlaidLink] Event: ', {event, metadata});
+            Log.info('[PlaidLink] Event: ', false, {event, metadata});
         },
     });
 

src/components/PlaidLink/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import {NativeEventEmitter} from 'react-native';
 import {openLink} from 'react-native-plaid-link-sdk';
+import Log from '../../libs/Log';
 import CONST from '../../CONST';
 import nativeModule from './nativeModule';
 import {plaidLinkPropTypes, plaidLinkDefaultProps} from './plaidLinkPropTypes';
@@ -35,7 +36,7 @@ class PlaidLink extends React.Component {
      * @param {*} event
      */
     onEvent(event) {
-        console.debug('[PlaidLink] Handled Plaid Event: ', event);
+        Log.info('[PlaidLink] Handled Plaid Event: ', false, event);
         if (event.eventName === CONST.PLAID.EVENT.ERROR) {
             this.props.onError(event.metadata);
         } else if (event.eventName === CONST.PLAID.EVENT.EXIT) {

src/components/PlaidLink/index.native.js

@@ -7,6 +7,9 @@ import redirectToSignIn from './actions/SignInRedirect';
 import * as Network from './Network';
 import isViaExpensifyCashNative from './isViaExpensifyCashNative';
 
+// eslint-disable-next-line import/no-cycle
+import LogUtil from './Log';
+
 let isAuthenticating;
 let credentials;
 Onyx.connect({
@@ -57,7 +60,7 @@ function addDefaultValuesToParameters(command, parameters) {
         if (!authToken) {
             redirectToSignIn();
 
-            console.debug('A request was made without an authToken', {command, parameters});
+            LogUtil.info('A request was made without an authToken', false, {command, parameters});
             Network.pauseRequestQueue();
             Network.clearRequestQueue();
             Network.unpauseRequestQueue();
@@ -172,7 +175,11 @@ Network.registerResponseHandler((queuedRequest, response) => {
 });
 
 Network.registerErrorHandler((queuedRequest, error) => {
-    console.debug('[API] Handled error when making request', error);
+    if (queuedRequest.command !== 'Log') {
+        LogUtil.hmmm('[API] Handled error when making request', error);
+    } else {
+        console.debug('[API] There was an error in the Log API command, unable to log to server!', error);
+    }
 
     // Set an error state and signify we are done loading
     Onyx.merge(ONYXKEYS.SESSION, {loading: false, error: 'Cannot connect to server'});
@@ -304,7 +311,7 @@ function reauthenticate(command = '') {
             // If we experience something other than a network error then redirect the user to sign in
             redirectToSignIn(error.message);
 
-            console.debug('Redirecting to Sign In because we failed to reauthenticate', {
+            LogUtil.hmmm('Redirecting to Sign In because we failed to reauthenticate', {
                 command,
                 error: error.message,
             });

src/libs/API.js

@@ -1,11 +1,13 @@
 import Logger from 'expensify-common/lib/Logger';
-import * as API from './API';
 import CONFIG from '../CONFIG';
 import getPlatform from './getPlatform';
 import {version} from '../../package.json';
 import NetworkConnection from './NetworkConnection';
 import HttpUtils from './HttpUtils';
 
+// eslint-disable-next-line import/no-cycle
+import * as API from './API';
+
 let timeout = null;
 
 /**

src/libs/Log.js

@@ -1,6 +1,42 @@
 import {CommonActions, StackActions, DrawerActions} from '@react-navigation/native';
 import lodashGet from 'lodash/get';
 
+/**
+ * Go back to the Main Drawer
+ * @param {Object} navigationRef
+ */
+function navigateBackToRootDrawer(navigationRef) {
+    let isLeavingNestedDrawerNavigator = false;
+
+    // This should take us to the first view of the modal's stack navigator
+    navigationRef.current.dispatch((state) => {
+        // If this is a nested drawer navigator then we pop the screen and
+        // prevent calling goBack() as it's default behavior is to toggle open the active drawer
+        if (state.type === 'drawer') {
+            isLeavingNestedDrawerNavigator = true;
+            return StackActions.pop();
+        }
+
+        // If there are multiple routes then we can pop back to the first route
+        if (state.routes.length > 1) {
+            return StackActions.popToTop();
+        }
+
+        // Otherwise, we are already on the last page of a modal so just do nothing here as goBack() will navigate us
+        // back to the screen we were on before we opened the modal.
+        return StackActions.pop(0);
+    });
+
+    if (isLeavingNestedDrawerNavigator) {
+        return;
+    }
+
+    // Navigate back to where we were before we launched the modal
+    if (navigationRef.current.canGoBack()) {
+        navigationRef.current.goBack();
+    }
+}
+
 /**
  * In order to create the desired browser navigation behavior on web and mobile web we need to replace any
  * type: 'drawer' routes with a type: 'route' so that when pushing to a report screen we never show the
@@ -24,7 +60,7 @@ function pushDrawerRoute(screenName, params, navigationRef) {
 
         if (activeReportID === params.reportID) {
             if (state.type !== 'drawer') {
-                navigationRef.current.dispatch(StackActions.pop());
+                navigateBackToRootDrawer(navigationRef);
             }
             return DrawerActions.closeDrawer();
         }
@@ -52,4 +88,5 @@ function pushDrawerRoute(screenName, params, navigationRef) {
 
 export default {
     pushDrawerRoute,
+    navigateBackToDrawer: navigateBackToRootDrawer,
 };

src/libs/Navigation/CustomActions.js

@@ -8,6 +8,7 @@ import {
 } from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import Onyx from 'react-native-onyx';
+import Log from '../Log';
 import linkTo from './linkTo';
 import ROUTES from '../../ROUTES';
 import SCREENS from '../../SCREENS';
@@ -39,7 +40,7 @@ function setDidTapNotification() {
  */
 function openDrawer() {
     if (!navigationRef.isReady()) {
-        console.debug('[Navigation] openDrawer failed because navigation ref was not yet ready');
+        Log.hmmm('[Navigation] openDrawer failed because navigation ref was not yet ready');
         return;
     }
     navigationRef.current.dispatch(DrawerActions.openDrawer());
@@ -51,7 +52,7 @@ function openDrawer() {
  */
 function closeDrawer() {
     if (!navigationRef.isReady()) {
-        console.debug('[Navigation] closeDrawer failed because navigation ref was not yet ready');
+        Log.hmmm('[Navigation] closeDrawer failed because navigation ref was not yet ready');
         return;
     }
     navigationRef.current.dispatch(DrawerActions.closeDrawer());
@@ -74,12 +75,12 @@ function getDefaultDrawerState(isSmallScreenWidth) {
  */
 function goBack(shouldOpenDrawer = true) {
     if (!navigationRef.isReady()) {
-        console.debug('[Navigation] goBack failed because navigation ref was not yet ready');
+        Log.hmmm('[Navigation] goBack failed because navigation ref was not yet ready');
         return;
     }
 
     if (!navigationRef.current.canGoBack()) {
-        console.debug('Unable to go back');
+        Log.hmmm('[Navigation] Unable to go back');
         if (shouldOpenDrawer) {
             openDrawer();
         }
@@ -95,7 +96,7 @@ function goBack(shouldOpenDrawer = true) {
  */
 function navigate(route = ROUTES.HOME) {
     if (!navigationRef.isReady()) {
-        console.debug('[Navigation] navigate failed because navigation ref was not yet ready');
+        Log.hmmm('[Navigation] navigate failed because navigation ref was not yet ready', {route});
         return;
     }
 
@@ -129,47 +130,18 @@ function navigate(route = ROUTES.HOME) {
  */
 function dismissModal(shouldOpenDrawer = false) {
     if (!navigationRef.isReady()) {
-        console.debug('[Navigation] dismissModal failed because navigation ref was not yet ready');
+        Log.hmmm('[Navigation] dismissModal failed because navigation ref was not yet ready');
         return;
     }
 
     const normalizedShouldOpenDrawer = _.isBoolean(shouldOpenDrawer)
         ? shouldOpenDrawer
         : false;
 
-    let isLeavingDrawerNavigator;
-
-    // This should take us to the first view of the modal's stack navigator
-    navigationRef.current.dispatch((state) => {
-        // If this is a nested drawer navigator then we pop the screen and
-        // prevent calling goBack() as it's default behavior is to toggle open the active drawer
-        if (state.type === 'drawer') {
-            isLeavingDrawerNavigator = true;
-            return StackActions.pop();
-        }
-
-        // If there are multiple routes then we can pop back to the first route
-        if (state.routes.length > 1) {
-            return StackActions.popToTop();
-        }
-
-        // Otherwise, we are already on the last page of a modal so just do nothing here as goBack() will navigate us
-        // back to the screen we were on before we opened the modal.
-        return StackActions.pop(0);
-    });
-
-    if (isLeavingDrawerNavigator) {
-        return;
-    }
-
-    // Navigate back to where we were before we launched the modal
-    goBack(shouldOpenDrawer);
-
-    if (!normalizedShouldOpenDrawer) {
-        return;
+    CustomActions.navigateBackToDrawer(navigationRef);
+    if (normalizedShouldOpenDrawer) {
+        openDrawer();
     }
-
-    openDrawer();
 }
 
 /**