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
6 changes: 6 additions & 0 deletions src/components/ReportActionItem/MoneyRequestView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,12 @@ function MoneyRequestView({
if (isExpenseSplit) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.split')}`;
}
if (currency !== moneyRequestReport?.currency && !isCardTransaction) {
const convertedAmount = isPaidGroupPolicy(moneyRequestReport) ? -(transaction?.convertedAmount ?? 0) : (transaction?.convertedAmount ?? 0);
if (convertedAmount) {
amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('common.converted')} ${convertToDisplayString(convertedAmount, moneyRequestReport?.currency)}`;
}
}

if (isFromMergeTransaction) {
// Because we lack the necessary data in policy.customUnits to determine the rate in merge flow,
Expand Down
1 change: 1 addition & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'bis',
genericErrorMessage: 'Ups ... Etwas ist schiefgelaufen und Ihre Anfrage konnte nicht abgeschlossen werden. Bitte versuchen Sie es später erneut.',
percentage: 'Prozentsatz',
converted: 'Konvertiert',
error: {
invalidAmount: 'Ungültiger Betrag',
acceptTerms: 'Sie müssen die Nutzungsbedingungen akzeptieren, um fortzufahren',
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ const translations = {
conjunctionTo: 'to',
genericErrorMessage: 'Oops... something went wrong and your request could not be completed. Please try again later.',
percentage: 'Percentage',
converted: 'Converted',
error: {
invalidAmount: 'Invalid amount',
acceptTerms: 'You must accept the Terms of Service to continue',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'a',
genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor, inténtalo más tarde.',
percentage: 'Porcentaje',
converted: 'Convertido',
error: {
invalidAmount: 'Importe no válido',
acceptTerms: 'Debes aceptar los Términos de Servicio para continuar',
Expand Down
1 change: 1 addition & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'à',
genericErrorMessage: 'Oups... une erreur s’est produite et votre demande n’a pas pu être complétée. Veuillez réessayer plus tard.',
percentage: 'Pourcentage',
converted: 'Converti',
error: {
invalidAmount: 'Montant invalide',
acceptTerms: 'Vous devez accepter les Conditions d’utilisation pour continuer',
Expand Down
1 change: 1 addition & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'a',
genericErrorMessage: 'Ops... si è verificato un errore e la tua richiesta non può essere completata. Riprova più tardi.',
percentage: 'Percentuale',
converted: 'Convertito',
error: {
invalidAmount: 'Importo non valido',
acceptTerms: 'Devi accettare i Termini di servizio per continuare',
Expand Down
1 change: 1 addition & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: '宛先',
genericErrorMessage: 'おっと…問題が発生したため、リクエストを完了できませんでした。後でもう一度お試しください。',
percentage: 'パーセンテージ',
converted: '変換済み',
error: {
invalidAmount: '金額が無効です',
acceptTerms: '続行するには利用規約に同意する必要があります',
Expand Down
1 change: 1 addition & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'naar',
genericErrorMessage: 'Oeps... er is iets misgegaan en je verzoek kon niet worden voltooid. Probeer het later opnieuw.',
percentage: 'Percentage',
converted: 'Geconverteerd',
error: {
invalidAmount: 'Ongeldig bedrag',
acceptTerms: 'U moet de Servicevoorwaarden accepteren om door te gaan',
Expand Down
1 change: 1 addition & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'do',
genericErrorMessage: 'Ups... coś poszło nie tak i nie udało się zrealizować Twojego żądania. Spróbuj ponownie później.',
percentage: 'Procent',
converted: 'Przekonwertowane',
error: {
invalidAmount: 'Nieprawidłowa kwota',
acceptTerms: 'Musisz zaakceptować Regulamin świadczenia usług, aby kontynuować',
Expand Down
1 change: 1 addition & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: 'para',
genericErrorMessage: 'Ops... algo deu errado e sua solicitação não pôde ser concluída. Tente novamente mais tarde.',
percentage: 'Porcentagem',
converted: 'Convertido',
error: {
invalidAmount: 'Valor inválido',
acceptTerms: 'Você deve aceitar os Termos de Serviço para continuar',
Expand Down
1 change: 1 addition & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ const translations: TranslationDeepObject<typeof en> = {
conjunctionTo: '到',
genericErrorMessage: '哎呀……出现了一些问题,无法完成您的请求。请稍后再试。',
percentage: '百分比',
converted: '已转换',
error: {
invalidAmount: '金额无效',
acceptTerms: '您必须接受服务条款才能继续',
Expand Down
Loading