Merge branch 'andrew-scan' into simplify-global-create-menu-material-…

…top-tab2
MaciejSWM · Aug 1, 2023 · 7b4da52 · 7b4da52
2 parents 3624178 + 20cce36
commit 7b4da52
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/src/CONST.js b/src/CONST.js
@@ -2548,10 +2548,10 @@ const CONST = {
     },
     TAB: {
         RECEIPT_TAB_ID: 'ReceiptTab',
-        TAB_MANUAL: 'manual',
-        TAB_SCAN: 'scan',
-        TAB_NEW_CHAT: 'chat',
-        TAB_NEW_ROOM: 'room',
+        MANUAL: 'manual',
+        SCAN: 'scan',
+        NEW_CHAT: 'chat',
+        NEW_ROOM: 'room',
     },
 };
 

diff --git a/src/components/TabSelector/TabSelector.js b/src/components/TabSelector/TabSelector.js
@@ -26,13 +26,13 @@ const defaultProps = {
 
 const getIcon = (route) => {
     switch (route) {
-        case CONST.TAB.TAB_MANUAL:
+        case CONST.TAB.MANUAL:
             return Expensicons.Pencil;
-        case CONST.TAB.TAB_SCAN:
+        case CONST.TAB.SCAN:
             return Expensicons.Receipt;
-        case CONST.TAB.TAB_NEW_CHAT:
+        case CONST.TAB.NEW_CHAT:
             return Expensicons.User;
-        case CONST.TAB.TAB_NEW_ROOM:
+        case CONST.TAB.NEW_ROOM:
             return Expensicons.Hashtag;
         default:
             return Expensicons.DotIndicator

diff --git a/src/libs/Navigation/OnyxTabNavigator.js b/src/libs/Navigation/OnyxTabNavigator.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
 import {withOnyx} from 'react-native-onyx';
-import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import Tab from '../actions/Tab';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -28,19 +27,19 @@ const TopTab = createMaterialTopTabNavigator();
 function OnyxTabNavigator({id, selectedTab, children, ...rest}) {
     return (
         <TopTab.Navigator
+            /* eslint-disable-next-line react/jsx-props-no-spreading */
+            {...rest}
             id={id}
             initialRouteName={selectedTab}
             screenListeners={{
                 state: (event) => {
-                    const state = lodashGet(event, 'data.state', {});
+                    const state = event.data.state;
                     const index = state.index;
                     const routeNames = state.routeNames;
                     Tab.setSelectedTab(id, routeNames[index]);
                 },
                 ...(rest.screenListeners || {}),
             }}
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
-            {...rest}
         >
             {children}
         </TopTab.Navigator>

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -1497,7 +1497,6 @@ function setMoneyRequestReceipt(receiptPath, receiptSource) {
  * @param {Object} iou
  * @param {String} reportID
  * @param {Object} report
- * @param {Object} currentUserPersonalDetails
  */
 function navigateToNextPage(iou, reportID, report) {
     const moneyRequestID = `${iou.iouType}${reportID}`;
@@ -1533,7 +1532,6 @@ function navigateToNextPage(iou, reportID, report) {
  * @param {Object} iou
  * @param {String} reportID
  * @param {Object} report
- * @param {Object} currentUserPersonalDetails
  */
 function onReceiptImageSelected(file, iou, reportID, report) {
     if (!ReceiptUtils.isValidReceipt(file)) {

diff --git a/src/pages/NewChatSelectorPage.js b/src/pages/NewChatSelectorPage.js
@@ -47,11 +47,11 @@ function NewChatSelectorPage(props) {
                     )}
                 >
                     <TopTab.Screen
-                        name={CONST.TAB.TAB_NEW_CHAT}
+                        name={CONST.TAB.NEW_CHAT}
                         component={NewChatPage}
                     />
                     <TopTab.Screen
-                        name={CONST.TAB.TAB_NEW_ROOM}
+                        name={CONST.TAB.NEW_ROOM}
                         component={WorkspaceNewRoomPage}
                     />
                 </TopTab.Navigator>

diff --git a/src/pages/iou/MoneyRequestSelectorPage.js b/src/pages/iou/MoneyRequestSelectorPage.js
@@ -68,7 +68,7 @@ const defaultProps = {
         currency: CONST.CURRENCY.USD,
         participants: [],
     },
-    selectedTab: CONST.TAB.TAB_MANUAL,
+    selectedTab: CONST.TAB.MANUAL,
 };
 
 function MoneyRequestSelectorPage(props) {
@@ -82,7 +82,7 @@ function MoneyRequestSelectorPage(props) {
         [CONST.IOU.MONEY_REQUEST_TYPE.SPLIT]: translate('iou.splitBill'),
     };
 
-    const onTabPress = () => {
+    const resetMoneyRequestInfo = () => {
         const moneyRequestID = `${iouType.current}${reportID.current}`;
         IOU.resetMoneyRequestInfo(moneyRequestID, iouType.current);
     };
@@ -91,36 +91,37 @@ function MoneyRequestSelectorPage(props) {
         <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType.current)}>
             <ScreenWrapper includeSafeAreaPaddingBottom={false}>
                 {({safeAreaPaddingBottomStyle}) => (
-                    <DragAndDropProvider isDisabled={props.selectedTab === CONST.TAB.TAB_MANUAL}>
+                    <DragAndDropProvider isDisabled={props.selectedTab === CONST.TAB.MANUAL}>
                         <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
                             <HeaderWithBackButton
                                 title={title[iouType.current]}
                                 onBackButtonPress={() => Navigation.goBack()}
                             />
-                            {Permissions.canUseScanReceipts(props.betas) && (
+                            {Permissions.canUseScanReceipts(props.betas) ? (
                                 <OnyxTabNavigator
                                     id={CONST.TAB.RECEIPT_TAB_ID}
                                     tabBar={({state, navigation}) => (
                                         <TabSelector
                                             state={state}
                                             navigation={navigation}
-                                            onTabPress={onTabPress}
+                                            onTabPress={resetMoneyRequestInfo}
                                         />
                                     )}
                                 >
                                     <TopTab.Screen
-                                        name={CONST.TAB.TAB_MANUAL}
+                                        name={CONST.TAB.MANUAL}
                                         component={MoneyRequestAmount}
                                         initialParams={{reportID: reportID.current}}
                                     />
                                     <TopTab.Screen
-                                        name={CONST.TAB.TAB_SCAN}
+                                        name={CONST.TAB.SCAN}
                                         component={ReceiptSelector}
                                         initialParams={{reportID: reportID.current}}
                                     />
                                 </OnyxTabNavigator>
+                            ) : (
+                                !Permissions.canUseScanReceipts(props.betas) && <MoneyRequestAmount />
                             )}
-                            {!Permissions.canUseScanReceipts(props.betas) && <MoneyRequestAmount />}
                         </View>
                     </DragAndDropProvider>
                 )}