diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 97e915d47b22..3a1c35d46c94 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -128,7 +128,7 @@ function HeaderWithBackButton({
)}
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index d1272f1499ba..1fc8645d91e0 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -228,73 +228,79 @@ function MoneyRequestPreviewContent({
{isEmptyObject(transaction) && !ReportActionsUtils.isMessageDeleted(action) && action.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? (
) : (
-
-
-
- {getPreviewHeaderText() + (isSettled && !iouReport?.isCancelledIOU ? ` • ${getSettledMessage()}` : '')}
-
- {!isSettled && shouldShowRBR && (
-
- )}
-
-
-
-
- {displayAmount}
-
- {ReportUtils.isSettled(iouReport?.reportID) && !isBillSplit && (
-
+
+
+
+
+
+ {getPreviewHeaderText() + (isSettled && !iouReport?.isCancelledIOU ? ` • ${getSettledMessage()}` : '')}
+
+ {!isSettled && shouldShowRBR && (
-
- )}
-
- {isBillSplit && (
-
-
+ )}
- )}
-
-
-
- {!isCurrentUserManager && shouldShowPendingConversionMessage && (
- {translate('iou.pendingConversionMessage')}
- )}
- {shouldShowDescription && (
-
- ${parser.replace(merchantOrDescription)}`} />
+
+
+
+
+ {displayAmount}
+
+ {ReportUtils.isSettled(iouReport?.reportID) && !isBillSplit && (
+
+
+
+ )}
+
+ {isBillSplit && (
+
+
+
+ )}
+
+
+
+ {!isCurrentUserManager && shouldShowPendingConversionMessage && (
+ {translate('iou.pendingConversionMessage')}
+ )}
+ {shouldShowDescription && (
+
+ ${parser.replace(merchantOrDescription)}`} />
+
+ )}
+ {shouldShowMerchant && {merchantOrDescription}}
+
+ {isBillSplit && participantAccountIDs.length > 0 && !!requestAmount && requestAmount > 0 && (
+
+ {translate('iou.amountEach', {
+ amount: CurrencyUtils.convertToDisplayString(
+ IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency ?? ''),
+ requestCurrency,
+ ),
+ })}
+
+ )}
- )}
- {shouldShowMerchant && {merchantOrDescription}}
+
- {isBillSplit && participantAccountIDs.length > 0 && !!requestAmount && requestAmount > 0 && (
-
- {translate('iou.amountEach', {
- amount: CurrencyUtils.convertToDisplayString(
- IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency ?? ''),
- requestCurrency,
- ),
- })}
-
- )}
)}
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 0af7140e1523..0bd18d8ee7ea 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -292,7 +292,7 @@ function MoneyRequestView({
shouldShowTitleIcon={isSettled}
titleIcon={Expensicons.Checkmark}
description={amountDescription}
- titleStyle={styles.newKansasLarge}
+ titleStyle={styles.textHeadlineH2}
interactive={canEditAmount}
shouldShowRightIcon={canEditAmount}
onPress={() => Navigation.navigate(ROUTES.EDIT_REQUEST.getRoute(report.reportID, CONST.EDIT_REQUEST_FIELD.AMOUNT))}
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index cbc728ffd1ce..a84e4a041609 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -135,6 +135,7 @@ function ReportPreview({
const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(iouReport);
const transactionsWithReceipts = ReportUtils.getTransactionsWithReceipts(iouReportID);
const numberOfScanningReceipts = transactionsWithReceipts.filter((transaction) => TransactionUtils.isReceiptBeingScanned(transaction)).length;
+ const numberOfPendingRequests = transactionsWithReceipts.filter((transaction) => TransactionUtils.isPending(transaction) && TransactionUtils.isCardTransaction(transaction)).length;
const hasReceipts = transactionsWithReceipts.length > 0;
const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
@@ -151,8 +152,9 @@ function ReportPreview({
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
formattedMerchant ||
translate('iou.requestCount', {
- count: numberOfRequests - numberOfScanningReceipts,
+ count: numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests,
scanningReceipts: numberOfScanningReceipts,
+ pendingReceipts: numberOfPendingRequests,
});
const shouldShowSubmitButton = isDraftExpenseReport && reimbursableSpend !== 0;
@@ -265,74 +267,77 @@ function ReportPreview({
)}
-
-
-
- {getPreviewMessage()}
-
- {!iouSettled && hasErrors && (
-
- )}
-
-
-
- {getDisplayAmount()}
- {ReportUtils.isSettled(iouReportID) && (
-
+
+
+
+
+
+ {getPreviewMessage()}
+
+ {!iouSettled && hasErrors && (
+ )}
+
+
+
+
+ {getDisplayAmount()}
+ {ReportUtils.isSettled(iouReportID) && (
+
+
+
+ )}
+
- )}
-
-
- {shouldShowSubtitle && (
-
-
- {previewSubtitle || moneyRequestComment}
+ {shouldShowSubtitle && (
+
+
+ {previewSubtitle || moneyRequestComment}
+
+
+ )}
- )}
- {shouldShowSettlementButton && (
- chatReport && iouReport && paymentType && IOU.payMoneyRequest(paymentType, chatReport, iouReport)}
- enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
- addBankAccountRoute={bankAccountRoute}
- shouldHidePaymentOptions={!shouldShowPayButton}
- shouldShowApproveButton={shouldShowApproveButton}
- style={[styles.mt3]}
- kycWallAnchorAlignment={{
- horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
- vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
- }}
- paymentMethodDropdownAnchorAlignment={{
- horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
- vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
- }}
- isDisabled={!canAllowSettlement}
- />
- )}
- {shouldShowSubmitButton && (
-
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 4018eab57d2b..995279033a3e 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -604,8 +604,10 @@ export default {
receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
receiptScanningFailed: 'Receipt scanning failed. Enter the details manually.',
transactionPendingText: 'It takes a few days from the date the card was used for the transaction to post.',
- requestCount: ({count, scanningReceipts = 0}: RequestCountParams) =>
- `${count} ${Str.pluralize('request', 'requests', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}`,
+ requestCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
+ `${count} ${Str.pluralize('request', 'requests', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}${
+ pendingReceipts > 0 ? `, ${pendingReceipts} pending` : ''
+ }`,
deleteRequest: 'Delete request',
deleteConfirmation: 'Are you sure that you want to delete this request?',
settledExpensify: 'Paid',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 960b454137ea..f4b4e6a2f21e 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -597,8 +597,10 @@ export default {
receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
receiptScanningFailed: 'El escaneo de recibo ha fallado. Introduce los detalles manualmente.',
transactionPendingText: 'La transacción tarda unos días en contabilizarse desde la fecha en que se utilizó la tarjeta.',
- requestCount: ({count, scanningReceipts = 0}: RequestCountParams) =>
- `${count} ${Str.pluralize('solicitude', 'solicitudes', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}`,
+ requestCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
+ `${count} ${Str.pluralize('solicitude', 'solicitudes', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}${
+ pendingReceipts > 0 ? `, ${pendingReceipts} pendiente` : ''
+ }`,
deleteRequest: 'Eliminar solicitud',
deleteConfirmation: '¿Estás seguro de que quieres eliminar esta solicitud?',
settledExpensify: 'Pagado',
diff --git a/src/languages/types.ts b/src/languages/types.ts
index ed82bcd99a92..2bb05b614483 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -99,6 +99,7 @@ type ReportArchiveReasonsPolicyDeletedParams = {
type RequestCountParams = {
count: number;
scanningReceipts: number;
+ pendingReceipts: number;
};
type SettleExpensifyCardParams = {
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 304cc9e7f6bd..7b1e2e78fe81 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -440,11 +440,19 @@ const styles = (theme: ThemeColors) =>
lineHeight: variables.lineHeightXXXLarge,
},
+ textHeadlineH2: {
+ ...headlineFont,
+ ...whiteSpace.preWrap,
+ color: theme.heading,
+ fontSize: variables.fontSizeh2,
+ lineHeight: variables.lineHeightSizeh2,
+ },
+
textHeadlineH1: {
...headlineFont,
...whiteSpace.preWrap,
color: theme.heading,
- fontSize: variables.fontSizeh1,
+ fontSize: variables.fontSizeXLarge,
lineHeight: variables.lineHeightSizeh1,
},
@@ -4028,14 +4036,26 @@ const styles = (theme: ThemeColors) =>
borderRadius: variables.componentBorderRadiusLarge,
},
- reportPreviewBoxBody: {
+ expenseAndReportPreviewBoxBody: {
padding: 16,
},
+ expenseAndReportPreviewTextContainer: {
+ gap: 8,
+ },
+
+ reportPreviewAmountSubtitleContainer: {
+ gap: 4,
+ },
+
+ expenseAndReportPreviewTextButtonContainer: {
+ gap: 16,
+ },
+
reportActionItemImages: {
flexDirection: 'row',
margin: 4,
- borderRadius: variables.componentBorderRadiusLarge,
+ borderRadius: 12,
overflow: 'hidden',
height: variables.reportActionImagesSingleImageHeight,
},
diff --git a/src/styles/utils/spacing.ts b/src/styles/utils/spacing.ts
index 389727f32ee5..515be45eb3b3 100644
--- a/src/styles/utils/spacing.ts
+++ b/src/styles/utils/spacing.ts
@@ -243,6 +243,10 @@ export default {
marginTop: 'auto',
},
+ mtn1: {
+ marginTop: -4,
+ },
+
mtn2: {
marginTop: -8,
},
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 3d5115a31f54..63611eccb199 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -58,6 +58,7 @@ export default {
fontSizeHero: 36,
fontSizeHeroXL: 72,
fontSizeh1: 19,
+ fontSizeh2: 19,
fontSizeXLarge: 22,
fontSizeXXLarge: 28,
fontSizeXXXLarge: 32,
@@ -106,7 +107,8 @@ export default {
lineHeightXLarge: getValueUsingPixelRatio(20, 24),
lineHeightXXLarge: getValueUsingPixelRatio(27, 32),
lineHeightXXXLarge: getValueUsingPixelRatio(32, 37),
- lineHeightSizeh1: getValueUsingPixelRatio(23, 28),
+ lineHeightSizeh1: getValueUsingPixelRatio(28, 32),
+ lineHeightSizeh2: getValueUsingPixelRatio(24, 28),
lineHeightSignInHeroXSmall: getValueUsingPixelRatio(32, 37),
inputHeight: getValueUsingPixelRatio(52, 72),
inputHeightSmall: 28,