Fix cherry pick merge conflicts

Expensify · May 12, 2023 · 31912ae · 31912ae
1 parent e071e1f
commit 31912ae
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 27 deletions.
diff --git a/src/languages/en.js b/src/languages/en.js
@@ -325,11 +325,8 @@ export default {
         settlePaypalMe: 'Pay with PayPal.me',
         requestAmount: ({amount}) => `request ${amount}`,
         splitAmount: ({amount}) => `split ${amount}`,
-<<<<<<< HEAD
-=======
         payerOwesAmount: ({payer, amount}) => `${payer} owes ${amount}`,
         payerSettled: ({amount}) => `settled up ${amount}`,
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
         error: {

diff --git a/src/languages/es.js b/src/languages/es.js
@@ -324,11 +324,8 @@ export default {
         settlePaypalMe: 'Pagar con PayPal.me',
         requestAmount: ({amount}) => `solicitar ${amount}`,
         splitAmount: ({amount}) => `dividir ${amount}`,
-<<<<<<< HEAD
-=======
         payerOwesAmount: ({payer, amount}) => `${payer} debe ${amount}`,
         payerSettled: ({amount}) => `pagado ${amount}`,
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
         noReimbursableExpenses: 'El monto de este informe es inválido',
         pendingConversionMessage: 'El total se actualizará cuando estés online',
         error: {

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -1964,9 +1964,5 @@ export {
     canRequestMoney,
     getWhisperDisplayNames,
     getWorkspaceAvatar,
-<<<<<<< HEAD
-=======
-    shouldReportShowSubscript,
     isSettled,
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
 };
diff --git a/src/pages/signin/SignInPageLayout/Footer.js b/src/pages/signin/SignInPageLayout/Footer.js
@@ -30,13 +30,9 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-<<<<<<< HEAD
 const defaultProps = {
     scrollViewRef: undefined,
 };
-=======
-const defaultProps = {};
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
 
 const navigateHome = (scrollViewRef) => {
     const currentRoute = navigationRef.current.getCurrentRoute();
@@ -53,11 +49,7 @@ const navigateHome = (scrollViewRef) => {
     Session.clearSignInData();
 };
 
-<<<<<<< HEAD
 const columns = [
-=======
-const columns = ({scrollPageToTop}) => [
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
     {
         translationPath: 'footer.features',
         rows: [

diff --git a/src/styles/getModalStyles/getBaseModalStyles.js b/src/styles/getModalStyles/getBaseModalStyles.js
@@ -1,15 +1,6 @@
 import CONST from '../../CONST';
 import variables from '../variables';
 import themeColors from '../themes/default';
-<<<<<<< HEAD
-=======
-import styles from '../styles';
-
-const getCenteredModalStyles = (windowWidth, isSmallScreenWidth) => ({
-    borderWidth: styles.centeredModalStyles(isSmallScreenWidth).borderWidth,
-    width: isSmallScreenWidth ? '100%' : windowWidth - styles.centeredModalStyles(isSmallScreenWidth).marginHorizontal * 2,
-});
->>>>>>> cb076db69e (Merge pull request #18486 from Expensify/jules-displayReportPreview)
 
 export default (type, windowDimensions, popoverAnchorPosition = {}, innerContainerStyle = {}, outerStyle = {}) => {
     const {isSmallScreenWidth, windowWidth} = windowDimensions;