Fix conflict issues

Author: ishakakkad

src/pages/iou/request/IOURequestStartPage.tsx

@@ -19,7 +19,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
 import {getIsUserSubmittedExpenseOrScannedReceipt} from '@libs/OptionsListUtils';
 import Performance from '@libs/Performance';
-import Permissions from '@libs/Permissions';
 import {getPerDiemCustomUnit, getPerDiemCustomUnits, isUserInvitedToWorkspace} from '@libs/PolicyUtils';
 import {getPayeeName} from '@libs/ReportUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -143,7 +142,6 @@ function IOURequestStartPage({
         iouType !== CONST.IOU.TYPE.SPLIT && iouType !== CONST.IOU.TYPE.TRACK && ((!isFromGlobalCreate && doesCurrentPolicyPerDiemExist) || (isFromGlobalCreate && doesPerDiemPolicyExist));
 
     const {isBetaEnabled} = usePermissions();
-    const [betas] = useOnyx(ONYXKEYS.BETAS, {canBeMissing: false});
     const setTestReceiptAndNavigateRef = useRef<() => void>();
     const {shouldShowProductTrainingTooltip, renderProductTrainingTooltip} = useProductTrainingContext(
         CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SCAN_TEST_TOOLTIP,
@@ -157,7 +155,6 @@ function IOURequestStartPage({
             },
         },
     );
-    
 
     return (
         <AccessOrNotFoundWrapper

src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

@@ -28,7 +28,6 @@ import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Text from '@components/Text';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -96,7 +95,6 @@ function IOURequestStepScan({
     const device = useCameraDevice('back', {
         physicalDevices: ['wide-angle-camera', 'ultra-wide-angle-camera'],
     });
-    const {isBetaEnabled} = usePermissions();
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const hasFlash = !!device?.hasFlash;
@@ -785,7 +783,7 @@ function IOURequestStepScan({
                                 src={Hand}
                                 width={CONST.RECEIPT.HAND_ICON_WIDTH}
                                 height={CONST.RECEIPT.HAND_ICON_HEIGHT}
-                                style={styles.pb5}  
+                                style={styles.pb5}
                             />
 
                             <Text style={[styles.textFileUpload]}>{translate('receipt.takePhoto')}</Text>

src/pages/iou/request/step/IOURequestStepScan/index.tsx

@@ -148,7 +148,6 @@ function IOURequestStepScan({
     const transactionTaxCode = (initialTransaction?.taxCode ? initialTransaction?.taxCode : defaultTaxCode) ?? '';
     const transactionTaxAmount = initialTransaction?.taxAmount ?? 0;
 
-
     const blinkOpacity = useSharedValue(0);
     const blinkStyle = useAnimatedStyle(() => ({
         opacity: blinkOpacity.get(),