Revert "Merge pull request #44170 from software-mansion-labs/@kosmyde…

…l/qbo-export/manual-exports" This reverts commit 303c398, reversing changes made to 936ae92.
Expensify · Jul 17, 2024 · 8be13b0 · 8be13b0
1 parent 4daf9e9
commit 8be13b0
Show file tree

Hide file tree

Showing 37 changed files with 43 additions and 804 deletions.
diff --git a/assets/images/LaptopwithSecondScreenandHourglass.svg b/assets/images/LaptopwithSecondScreenandHourglass.svg
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -897,10 +897,6 @@ const CONST = {
             INDIVIDUAL: 'individual',
             BUSINESS: 'policy',
         },
-        EXPORT_OPTIONS: {
-            EXPORT_TO_INTEGRATION: 'exportToIntegration',
-            MARK_AS_EXPORTED: 'markAsExported',
-        },
     },
     NEXT_STEP: {
         FINISHED: 'Finished!',
@@ -2464,7 +2460,6 @@ const CONST = {
         SETTINGS: 'settings',
         LEAVE_ROOM: 'leaveRoom',
         PRIVATE_NOTES: 'privateNotes',
-        EXPORT: 'export',
         DELETE: 'delete',
         MARK_AS_INCOMPLETE: 'markAsIncomplete',
         CANCEL_PAYMENT: 'cancelPayment',

diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
@@ -376,9 +376,6 @@ const ONYXKEYS = {
     /** Stores info during review duplicates flow */
     REVIEW_DUPLICATES: 'reviewDuplicates',
 
-    /** Stores the last export method for policy */
-    LAST_EXPORT_METHOD: 'lastExportMethod',
-
     /** Stores the information about the state of issuing a new card */
     ISSUE_NEW_EXPENSIFY_CARD: 'issueNewExpensifyCard',
 
@@ -754,7 +751,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION]: boolean;
     [ONYXKEYS.FOCUS_MODE_NOTIFICATION]: boolean;
     [ONYXKEYS.NVP_LAST_PAYMENT_METHOD]: OnyxTypes.LastPaymentMethod;
-    [ONYXKEYS.LAST_EXPORT_METHOD]: OnyxTypes.LastExportMethod;
     [ONYXKEYS.NVP_RECENT_WAYPOINTS]: OnyxTypes.RecentWaypoint[];
     [ONYXKEYS.NVP_INTRO_SELECTED]: OnyxTypes.IntroSelected;
     [ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES]: OnyxTypes.LastSelectedDistanceRates;

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -3,7 +3,7 @@ import type CONST from './CONST';
 import type {IOUAction, IOUType} from './CONST';
 import type {IOURequestType} from './libs/actions/IOU';
 import type {AuthScreensParamList} from './libs/Navigation/types';
-import type {ConnectionName, SageIntacctMappingName} from './types/onyx/Policy';
+import type {SageIntacctMappingName} from './types/onyx/Policy';
 import type {SearchQuery} from './types/onyx/SearchResults';
 import type AssertTypesNotEqual from './types/utils/AssertTypesNotEqual';
 
@@ -287,10 +287,6 @@ const ROUTES = {
         route: 'r/:reportID/details',
         getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/details`, backTo),
     },
-    REPORT_WITH_ID_DETAILS_EXPORT: {
-        route: 'r/:reportID/details/export/:connectionName',
-        getRoute: (reportID: string, connectionName: ConnectionName) => `r/${reportID}/details/export/${connectionName}` as const,
-    },
     REPORT_SETTINGS: {
         route: 'r/:reportID/settings',
         getRoute: (reportID: string) => `r/${reportID}/settings` as const,

diff --git a/src/SCREENS.ts b/src/SCREENS.ts
@@ -147,7 +147,6 @@ const SCREENS = {
         SEARCH_REPORT: 'SearchReport',
         SETTINGS_CATEGORIES: 'SettingsCategories',
         RESTRICTED_ACTION: 'RestrictedAction',
-        REPORT_EXPORT: 'Report_Export',
     },
     ONBOARDING_MODAL: {
         ONBOARDING: 'Onboarding',
@@ -241,7 +240,6 @@ const SCREENS = {
     REPORT_DETAILS: {
         ROOT: 'Report_Details_Root',
         SHARE_CODE: 'Report_Details_Share_Code',
-        EXPORT: 'Report_Details_Export',
     },
 
     WORKSPACE: {

diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts
@@ -14,8 +14,6 @@ type WorkspaceDistanceRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.BULK
 
 type WorkspaceTaxRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>;
 
-type ReportExportType = DeepValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>;
-
 type DropdownOption<TValueType> = {
     value: TValueType;
     text: string;
@@ -86,12 +84,4 @@ type ButtonWithDropdownMenuProps<TValueType> = {
     isSplitButton?: boolean;
 };
 
-export type {
-    PaymentType,
-    WorkspaceMemberBulkActionType,
-    WorkspaceDistanceRatesBulkActionType,
-    DropdownOption,
-    ButtonWithDropdownMenuProps,
-    WorkspaceTaxRatesBulkActionType,
-    ReportExportType,
-};
+export type {PaymentType, WorkspaceMemberBulkActionType, WorkspaceDistanceRatesBulkActionType, DropdownOption, ButtonWithDropdownMenuProps, WorkspaceTaxRatesBulkActionType};
diff --git a/src/components/ConfirmationPage.tsx b/src/components/ConfirmationPage.tsx
@@ -1,20 +1,17 @@
 import React from 'react';
-import type {TextStyle, ViewStyle} from 'react-native';
+import type {TextStyle} from 'react-native';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import isIllustrationLottieAnimation from '@libs/isIllustrationLottieAnimation';
-import type IconAsset from '@src/types/utils/IconAsset';
 import Button from './Button';
 import FixedFooter from './FixedFooter';
-import ImageSVG from './ImageSVG';
 import Lottie from './Lottie';
 import LottieAnimations from './LottieAnimations';
 import type DotLottieAnimation from './LottieAnimations/types';
 import Text from './Text';
 
 type ConfirmationPageProps = {
     /** The asset to render */
-    illustration?: DotLottieAnimation | IconAsset;
+    animation?: DotLottieAnimation;
 
     /** Heading of the confirmation page */
     heading: string;
@@ -34,45 +31,31 @@ type ConfirmationPageProps = {
     /** Additional style for the heading */
     headingStyle?: TextStyle;
 
-    /** Additional style for the animation */
-    illustrationStyle?: ViewStyle;
-
     /** Additional style for the description */
     descriptionStyle?: TextStyle;
 };
 
 function ConfirmationPage({
-    illustration = LottieAnimations.Fireworks,
+    animation = LottieAnimations.Fireworks,
     heading,
     description,
     buttonText = '',
     onButtonPress = () => {},
     shouldShowButton = false,
     headingStyle,
-    illustrationStyle,
     descriptionStyle,
 }: ConfirmationPageProps) {
     const styles = useThemeStyles();
-    const isLottie = isIllustrationLottieAnimation(illustration);
 
     return (
         <>
             <View style={[styles.screenCenteredContainer, styles.alignItemsCenter]}>
-                {isLottie ? (
-                    <Lottie
-                        source={illustration}
-                        autoPlay
-                        loop
-                        style={[styles.confirmationAnimation, illustrationStyle]}
-                    />
-                ) : (
-                    <View style={[styles.confirmationAnimation, illustrationStyle]}>
-                        <ImageSVG
-                            src={illustration}
-                            contentFit="contain"
-                        />
-                    </View>
-                )}
+                <Lottie
+                    source={animation}
+                    autoPlay
+                    loop
+                    style={styles.confirmationAnimation}
+                />
                 <Text style={[styles.textHeadline, styles.textAlignCenter, styles.mv2, headingStyle]}>{heading}</Text>
                 <Text style={[styles.textAlignCenter, descriptionStyle]}>{description}</Text>
             </View>

diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts
@@ -1,5 +1,4 @@
 import ExpensifyCardIllustration from '@assets/images/expensifyCard/cardIllustration.svg';
-import LaptopwithSecondScreenandHourglass from '@assets/images/LaptopwithSecondScreenandHourglass.svg';
 import Abracadabra from '@assets/images/product-illustrations/abracadabra.svg';
 import BankArrowPink from '@assets/images/product-illustrations/bank-arrow--pink.svg';
 import BankMouseGreen from '@assets/images/product-illustrations/bank-mouse--green.svg';
@@ -147,7 +146,6 @@ export {
     PinkBill,
     CreditCardsNew,
     InvoiceBlue,
-    LaptopwithSecondScreenandHourglass,
     LockOpen,
     Luggage,
     MoneyIntoWallet,

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
@@ -9,7 +9,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
@@ -35,7 +34,6 @@ import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusB
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu';
-import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
 import SettlementButton from './SettlementButton';
 
 type MoneyReportHeaderProps = {
@@ -101,7 +99,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const canAllowSettlement = ReportUtils.hasUpdatedTotal(moneyRequestReport, policy);
     const policyType = policy?.type;
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
-    const connectedIntegration = PolicyUtils.getConnectedIntegration(policy);
 
     const navigateBackToAfterDelete = useRef<Route>();
     const hasScanningReceipt = ReportUtils.getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => TransactionUtils.isReceiptBeingScanned(t));
@@ -116,20 +113,15 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const shouldDisableApproveButton = shouldShowApproveButton && !ReportUtils.isAllowedToApproveExpenseReport(moneyRequestReport);
 
-    const shouldShowSubmitButton = isDraft && reimbursableSpend !== 0 && !allHavePendingRTERViolation;
-
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
-    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin;
-
-    const shouldShowSettlementButton = (shouldShowPayButton || shouldShowApproveButton) && !allHavePendingRTERViolation && !shouldShowExportIntegrationButton;
+    const shouldShowSettlementButton = (shouldShowPayButton || shouldShowApproveButton) && !allHavePendingRTERViolation;
 
+    const shouldShowSubmitButton = isDraft && reimbursableSpend !== 0 && !allHavePendingRTERViolation;
     const shouldDisableSubmitButton = shouldShowSubmitButton && !ReportUtils.isAllowedToSubmitDraftExpenseReport(moneyRequestReport);
     const shouldShowMarkAsCashButton = isDraft && allHavePendingRTERViolation;
     const isFromPaidPolicy = policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
     const shouldShowStatusBar = allHavePendingRTERViolation || hasOnlyHeldExpenses || hasScanningReceipt;
     const shouldShowNextStep = !ReportUtils.isClosedExpenseReportWithNoExpenses(moneyRequestReport) && isFromPaidPolicy && !!nextStep?.message?.length && !shouldShowStatusBar;
-    const shouldShowAnyButton =
-        shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep || allHavePendingRTERViolation || shouldShowExportIntegrationButton;
+    const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep || allHavePendingRTERViolation;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const formattedAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, moneyRequestReport.currency);
     const [nonHeldAmount, fullAmount] = ReportUtils.getNonHeldAndFullAmount(moneyRequestReport, policy);
@@ -283,15 +275,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                         />
                     </View>
                 )}
-                {shouldShowExportIntegrationButton && !shouldUseNarrowLayout && (
-                    <View style={[styles.pv2]}>
-                        <ExportWithDropdownMenu
-                            policy={policy}
-                            report={moneyRequestReport}
-                            connectionName={connectedIntegration}
-                        />
-                    </View>
-                )}
                 {shouldShowSubmitButton && !shouldUseNarrowLayout && (
                     <View style={styles.pv2}>
                         <Button
@@ -336,13 +319,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                             isLoading={!isOffline && !canAllowSettlement}
                         />
                     )}
-                    {shouldShowExportIntegrationButton && shouldUseNarrowLayout && (
-                        <ExportWithDropdownMenu
-                            policy={policy}
-                            report={moneyRequestReport}
-                            connectionName={connectedIntegration}
-                        />
-                    )}
                     {shouldShowSubmitButton && shouldUseNarrowLayout && (
                         <Button
                             medium

diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx