Fix conflicts

Expensify · Apr 19, 2024 · 64fa19d · 64fa19d
1 parent 97cf41a
commit 64fa19d
Showing 1 changed file with 3 additions and 56 deletions.
diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx
@@ -31,19 +31,8 @@ type IOURequestStepAmountOnyxProps = {
     /** The draft transaction that holds data to be persisted on the current transaction */
     splitDraftTransaction: OnyxEntry<Transaction>;
 
-<<<<<<< HEAD
-    /** The draft transaction object being modified in Onyx */
-    draftTransaction: OnyxEntry<Transaction>;
-=======
     /** The backup transaction object being modified in Onyx */
-    backupTransaction: OnyxEntry<OnyxTypes.Transaction>;
-
-    /** Personal details of all users */
-    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
-
-    /** The policy which the user has access to and which the report is tied to */
-    policy: OnyxEntry<OnyxTypes.Policy>;
->>>>>>> c1827d8b (Merge pull request #40605 from Expensify/beaman-fixIOURequestCurrency)
+    backupTransaction: OnyxEntry<Transaction>;
 };
 
 type IOURequestStepAmountProps = IOURequestStepAmountOnyxProps &
@@ -59,12 +48,7 @@ function IOURequestStepAmount({
     },
     transaction,
     splitDraftTransaction,
-<<<<<<< HEAD
-    draftTransaction,
-=======
     backupTransaction,
-    skipConfirmation,
->>>>>>> c1827d8b (Merge pull request #40605 from Expensify/beaman-fixIOURequestCurrency)
 }: IOURequestStepAmountProps) {
     const {translate} = useLocalize();
     const textInput = useRef<BaseTextInputRef | null>(null);
@@ -191,7 +175,6 @@ function IOURequestStepAmount({
 
 IOURequestStepAmount.displayName = 'IOURequestStepAmount';
 
-<<<<<<< HEAD
 export default withWritableReportOrNotFound(
     withFullTransactionOrNotFound(
         withOnyx<IOURequestStepAmountProps, IOURequestStepAmountOnyxProps>({
@@ -201,48 +184,12 @@ export default withWritableReportOrNotFound(
                     return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
                 },
             },
-            draftTransaction: {
+            backupTransaction: {
                 key: ({route}) => {
                     const transactionID = route.params.transactionID ?? 0;
-                    return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`;
+                    return `${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${transactionID}`;
                 },
             },
         })(IOURequestStepAmount),
     ),
 );
-=======
-const IOURequestStepAmountWithOnyx = withOnyx<IOURequestStepAmountProps, IOURequestStepAmountOnyxProps>({
-    splitDraftTransaction: {
-        key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
-            return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
-        },
-    },
-    backupTransaction: {
-        key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
-            return `${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${transactionID}`;
-        },
-    },
-    skipConfirmation: {
-        key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
-            return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
-        },
-    },
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-    policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
-    },
-})(IOURequestStepAmount);
-
-const IOURequestStepAmountWithCurrentUserPersonalDetails = withCurrentUserPersonalDetails(IOURequestStepAmountWithOnyx);
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepAmountWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepAmountWithCurrentUserPersonalDetails);
-// eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepAmountWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepAmountWithWritableReportOrNotFound);
-
-export default IOURequestStepAmountWithFullTransactionOrNotFound;
->>>>>>> c1827d8b (Merge pull request #40605 from Expensify/beaman-fixIOURequestCurrency)