Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Einige dieser Duplikate wurden bereits genehmigt oder bezahlt.',
reviewDuplicates: 'Duplikate prüfen',
keepAll: 'Alle behalten',
noDuplicatesTitle: 'Alles erledigt!',
noDuplicatesDescription: 'Es gibt hier keine doppelten Transaktionen zur Überprüfung.',
confirmApprove: 'Genehmigungsbetrag bestätigen',
confirmApprovalAmount: 'Nur regelkonforme Ausgaben genehmigen oder den gesamten Bericht genehmigen.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,8 @@ const translations = {
someDuplicatesArePaid: 'Some of these duplicates have been approved or paid already.',
reviewDuplicates: 'Review duplicates',
keepAll: 'Keep all',
noDuplicatesTitle: 'All set!',
noDuplicatesDescription: 'There are no duplicate transactions for review here.',
confirmApprove: 'Confirm approval amount',
confirmApprovalAmount: 'Approve only compliant expenses, or approve the entire report.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Algunos de estos duplicados ya han sido aprobados o pagados.',
reviewDuplicates: 'Revisar duplicados',
keepAll: 'Mantener todos',
noDuplicatesTitle: '¡Todo listo!',
noDuplicatesDescription: 'No hay transacciones duplicadas para revisar aquí.',
confirmApprove: 'Confirmar importe a aprobar',
confirmApprovalAmount: 'Aprueba sólo los gastos conformes, o aprueba todo el informe.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Certains de ces doublons ont déjà été approuvés ou payés.',
reviewDuplicates: 'Examiner les doublons',
keepAll: 'Tout garder',
noDuplicatesTitle: 'Tout est en ordre !',
noDuplicatesDescription: "Il n'y a aucune transaction en double à vérifier ici.",
confirmApprove: 'Confirmer le montant approuvé',
confirmApprovalAmount: 'Approuvez uniquement les dépenses conformes, ou approuvez l’intégralité de la note de frais.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
4 changes: 3 additions & 1 deletion src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1416,8 +1416,10 @@ const translations: TranslationDeepObject<typeof en> = {
expensesOnHold: 'Tutte le spese sono state messe in sospeso. Controlla i commenti per conoscere i prossimi passaggi.',
expenseDuplicate: 'Questa spesa ha dettagli simili a un’altra. Controlla i duplicati per continuare.',
someDuplicatesArePaid: 'Alcuni di questi duplicati sono già stati approvati o pagati.',
reviewDuplicates: 'Controlla i duplicati',
reviewDuplicates: 'Controlla duplicati',
keepAll: 'Mantieni tutto',
noDuplicatesTitle: 'Tutto a posto!',
noDuplicatesDescription: 'Non ci sono transazioni duplicate da verificare qui.',
confirmApprove: 'Conferma l’importo approvato',
confirmApprovalAmount: 'Approva solo le spese conformi oppure approva l’intero rapporto.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
4 changes: 3 additions & 1 deletion src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1405,9 +1405,11 @@ const translations: TranslationDeepObject<typeof en> = {
expenseOnHold: 'この経費は保留されています。今後の手順についてコメントを確認してください。',
expensesOnHold: 'すべての経費が保留になっています。次のステップについてはコメントを確認してください。',
expenseDuplicate: 'この経費は別の経費と詳細がよく似ています。続行するには重複しているものを確認してください。',
someDuplicatesArePaid: 'これらの重複のうち、いくつかはすでに承認または支払い済みです。',
someDuplicatesArePaid: 'これらの重複の一部は、すでに承認または支払い済みです。',
reviewDuplicates: '重複を確認',
keepAll: 'すべて保持',
noDuplicatesTitle: '準備完了!',
noDuplicatesDescription: '確認が必要な重複取引はありません。',
confirmApprove: '承認金額を確認',
confirmApprovalAmount: '準拠している経費のみを承認するか、レポート全体を承認します。',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Sommige van deze duplicaten zijn al goedgekeurd of betaald.',
reviewDuplicates: 'Dubbele items controleren',
keepAll: 'Alles behouden',
noDuplicatesTitle: 'Alles in orde!',
noDuplicatesDescription: 'Er zijn hier geen dubbele transacties om te beoordelen.',
confirmApprove: 'Bevestig goedkeuringsbedrag',
confirmApprovalAmount: 'Keur alleen conforme uitgaven goed, of keur het hele rapport goed.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Niektóre z tych duplikatów zostały już zatwierdzone lub opłacone.',
reviewDuplicates: 'Przejrzyj duplikaty',
keepAll: 'Zachowaj wszystko',
noDuplicatesTitle: 'Wszystko gotowe!',
noDuplicatesDescription: 'Nie ma tutaj zduplikowanych transakcji do sprawdzenia.',
confirmApprove: 'Potwierdź kwotę zatwierdzenia',
confirmApprovalAmount: 'Zatwierdź tylko zgodne wydatki lub zatwierdź cały raport.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,8 @@ const translations: TranslationDeepObject<typeof en> = {
someDuplicatesArePaid: 'Alguns desses duplicados já foram aprovados ou pagos.',
reviewDuplicates: 'Revisar duplicados',
keepAll: 'Manter tudo',
noDuplicatesTitle: 'Tudo pronto!',
noDuplicatesDescription: 'Não há transações duplicadas para revisar aqui.',
confirmApprove: 'Confirmar valor da aprovação',
confirmApprovalAmount: 'Aprove apenas as despesas em conformidade ou aprove o relatório inteiro.',
confirmApprovalAllHoldAmount: () => ({
Expand Down
6 changes: 4 additions & 2 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1385,9 +1385,11 @@ const translations: TranslationDeepObject<typeof en> = {
expenseOnHold: '此报销已被搁置。请查看评论以了解下一步操作。',
expensesOnHold: '所有报销都已被搁置。请查看评论以了解下一步操作。',
expenseDuplicate: '此报销与另一笔报销的明细相似。请查看可能重复的报销后再继续。',
someDuplicatesArePaid: '其中有些重复项已经被批准或支付。',
reviewDuplicates: '查看重复项',
someDuplicatesArePaid: '其中一些重复项已被批准或支付。',
reviewDuplicates: '审核重复项',
keepAll: '全部保留',
noDuplicatesTitle: '全部完成!',
noDuplicatesDescription: '这里没有需要审核的重复交易。',
confirmApprove: '确认批准金额',
confirmApprovalAmount: '仅批准合规报销,或批准整份报销报告。',
confirmApprovalAllHoldAmount: () => ({
Expand Down
19 changes: 19 additions & 0 deletions src/pages/TransactionDuplicate/Review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {View} from 'react-native';
import type {OnyxCollection} from 'react-native-onyx';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import Button from '@components/Button';
import ConfirmationPage from '@components/ConfirmationPage';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
Expand Down Expand Up @@ -178,6 +179,24 @@ function TransactionDuplicateReview() {
);
}

if (!shouldShowNotFound && transactionID && duplicateTransactionIDs.length === 0) {
return (
<ScreenWrapper testID="TransactionDuplicateReview">
<HeaderWithBackButton
title={translate('iou.reviewDuplicates')}
onBackButtonPress={() => Navigation.goBack(route.params.backTo)}
/>
<ConfirmationPage
heading={translate('iou.noDuplicatesTitle')}
description={translate('iou.noDuplicatesDescription')}
shouldShowButton
buttonText={translate('common.buttonConfirm')}
onButtonPress={() => Navigation.goBack(route.params.backTo)}
/>
</ScreenWrapper>
);
}

return (
<ScreenWrapper testID="TransactionDuplicateReview">
<FullPageNotFoundView shouldShow={shouldShowNotFound}>
Expand Down
Loading