Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
76ca88a
Added delete odometer translation
jakubkalinski0 Jan 26, 2026
8ad735d
Merge branch 'jakubkalinski0/Odometer_Build_Odometer_expense_image_ca…
jakubkalinski0 Jan 26, 2026
dd89470
Functional image preview for odometer image
jakubkalinski0 Jan 26, 2026
71332a8
Merge branch 'jakubkalinski0/Odometer_Build_Odometer_expense_image_ca…
jakubkalinski0 Jan 30, 2026
9f561dd
Merge branch 'jakubkalinski0/Odometer_Build_Odometer_expense_image_ca…
jakubkalinski0 Feb 5, 2026
b46e3e3
Standardize imageType across odometer flow
jakubkalinski0 Feb 5, 2026
c617959
prettier run
jakubkalinski0 Feb 5, 2026
48cf53a
Fix deleting single odometer photo
jakubkalinski0 Feb 5, 2026
e315aa2
Small cleanup
jakubkalinski0 Feb 5, 2026
775e0bd
Fix errors
jakubkalinski0 Feb 5, 2026
2f1aaff
Remove duplicate onPress from odometer
jakubkalinski0 Feb 5, 2026
b42523b
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 5, 2026
3a9b88d
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 6, 2026
6564e1a
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 9, 2026
afbfd9e
Adjust odometer photo translation to design team suggestion
jakubkalinski0 Feb 9, 2026
8245685
Fixed back navigation from odometer image to work after reload
jakubkalinski0 Feb 9, 2026
1112a90
Simplify odometer image actions names
jakubkalinski0 Feb 9, 2026
f05127f
prettier run
jakubkalinski0 Feb 9, 2026
90442d4
prettier run
jakubkalinski0 Feb 9, 2026
8146bb6
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 9, 2026
8cdbf86
Fixed image preview for odometer
jakubkalinski0 Feb 9, 2026
a1a73a2
Odometer small adjustments
jakubkalinski0 Feb 9, 2026
44087c6
Update translations for odometer
jakubkalinski0 Feb 9, 2026
e58054a
Removed redundant file manipulation
jakubkalinski0 Feb 9, 2026
aefbd92
Code cleanup
jakubkalinski0 Feb 9, 2026
d9327f4
Fix getImageSource in TransactionReceiptModalContent
jakubkalinski0 Feb 9, 2026
b70693c
Fix description for setMoneyRequestOdometerImage
jakubkalinski0 Feb 9, 2026
9ef3441
Restore normalization to fix download
jakubkalinski0 Feb 9, 2026
bd4d312
Added translations
jakubkalinski0 Feb 10, 2026
cb281e7
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 10, 2026
2bc8c7c
Revert wrongful deletion of translation by bot
jakubkalinski0 Feb 10, 2026
9577dad
Make delete receipt/odometer condition in preview more readable
jakubkalinski0 Feb 10, 2026
8918000
Revert one more wrongful deletion of translation by bot
jakubkalinski0 Feb 10, 2026
5e500c4
Prettier run
jakubkalinski0 Feb 10, 2026
e77c1eb
Corrected the title for odometer image attachment
jakubkalinski0 Feb 10, 2026
9b190ac
Fixed memory leak in TransactionReceiptModalContent
jakubkalinski0 Feb 10, 2026
1dd07b8
Revoke bloburl of odometerimage
jakubkalinski0 Feb 10, 2026
1b5a26d
Removed unused translations from odometer
jakubkalinski0 Feb 10, 2026
7b14951
Merge branch 'main' into jakubkalinski0/Odometer_Image_Preview
jakubkalinski0 Feb 11, 2026
a722ea3
Adjusted route to odometer image preview
jakubkalinski0 Feb 11, 2026
13418ef
Brought back the 'photo' to odometer end/start photo translation
jakubkalinski0 Feb 11, 2026
bd8ad98
Prettier run
jakubkalinski0 Feb 11, 2026
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
12 changes: 6 additions & 6 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1101,15 +1101,15 @@ const ROUTES = {
getUrlWithBackToParam(`${action as string}/${iouType as string}/report/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
},
MONEY_REQUEST_RECEIPT_PREVIEW: {
route: ':action/:iouType/receipt/:transactionID/:reportID',
getRoute: (reportID: string, transactionID: string, action: IOUAction, iouType: IOUType) => {
route: ':action/:iouType/receipt/:transactionID/:reportID/:imageType?',
getRoute: (reportID: string, transactionID: string, action: IOUAction, iouType: IOUType, imageType?: OdometerImageType) => {
if (!reportID) {
Log.warn('Invalid reportID is used to build the MONEY_REQUEST_RECEIPT_PREVIEW route');
}
if (!transactionID) {
Log.warn('Invalid transactionID is used to build the MONEY_REQUEST_RECEIPT_PREVIEW route');
}
return `${action}/${iouType}/receipt/${transactionID}/${reportID}?readonly=false` as const;
return `${action}/${iouType}/receipt/${transactionID}/${reportID}?readonly=false${imageType ? `&imageType=${imageType}` : ''}` as const;
},
},
MONEY_REQUEST_EDIT_REPORT: {
Expand Down Expand Up @@ -1450,9 +1450,9 @@ const ROUTES = {
`${action as string}/${iouType as string}/start/${transactionID}/${reportID}/distance-new${backToReport ? `/${backToReport}` : ''}/distance-odometer` as const,
},
ODOMETER_IMAGE: {
route: ':action/:iouType/odometer-image/:transactionID/:readingType',
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, readingType: OdometerImageType) =>
`${action as string}/${iouType as string}/odometer-image/${transactionID}/${readingType}` as const,
route: ':action/:iouType/odometer-image/:transactionID/:reportID/:imageType',
getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, imageType: OdometerImageType) =>
`${action as string}/${iouType as string}/odometer-image/${transactionID}/${reportID}/${imageType}` as const,
},
IOU_SEND_ADD_BANK_ACCOUNT: 'pay/new/add-bank-account',
IOU_SEND_ADD_DEBIT_CARD: 'pay/new/add-debit-card',
Expand Down
4 changes: 2 additions & 2 deletions src/components/Attachments/AttachmentView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {add as addCachedPDFPaths} from '@libs/actions/CachedPDFPaths';
import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
import {getFileResolution, isHighResolutionImage} from '@libs/fileDownload/FileUtils';
import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
import {hasEReceipt, hasReceiptSource, isDistanceRequest, isManualDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
import {hasEReceipt, hasReceiptSource, isDistanceRequest, isManualDistanceRequest, isOdometerDistanceRequest, isPerDiemRequest} from '@libs/TransactionUtils';
import type {ColorValue} from '@styles/utils/types';
import variables from '@styles/variables';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -257,7 +257,7 @@ function AttachmentView({
);
}

if (isDistanceRequest(transaction) && !isManualDistanceRequest(transaction) && transaction) {
if (isDistanceRequest(transaction) && !isManualDistanceRequest(transaction) && !isOdometerDistanceRequest(transaction) && transaction) {
// Distance eReceipts are now generated as a PDF, but to keep it backwards compatible we still show the old eReceipt view for image receipts
const isImageReceiptSource = checkIsFileImage(source, file?.name);
if (!hasReceiptSource(transaction) || isImageReceiptSource) {
Expand Down
28 changes: 15 additions & 13 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2733,13 +2733,13 @@ ${amount} für ${merchant} – ${date}`,
title: ({workspaceCategoriesLink}) => `Richte [Kategorien](${workspaceCategoriesLink}) ein`,
description: ({workspaceCategoriesLink}) =>
dedent(`
*Richte Kategorien ein*, damit dein Team Ausgaben für eine einfache Auswertung zuordnen kann.
*Richten Sie Kategorien ein*, damit Ihr Team Ausgaben für eine einfache Berichterstattung verschlüsseln kann.

1. Klicke auf *Workspaces*.
2. Wähle deinen Workspace aus.
3. Klicke auf *Categories*.
4. Deaktiviere alle Kategorien, die du nicht benötigst.
5. Füge oben rechts deine eigenen Kategorien hinzu.
1. Klicken Sie auf *Workspaces*.
2. Wählen Sie Ihren Workspace aus.
3. Klicken Sie auf *Categories*.
4. Deaktivieren Sie alle Kategorien, die Sie nicht benötigen.
5. Fügen Sie oben rechts Ihre eigenen Kategorien hinzu.

[Zu den Workspace-Kategorieneinstellungen](${workspaceCategoriesLink}).
`),
Expand Down Expand Up @@ -2824,13 +2824,13 @@ ${
title: ({workspaceMembersLink}) => `[your team](${workspaceMembersLink}) einladen`,
description: ({workspaceMembersLink}) =>
dedent(`
*Lade dein Team* zu Expensify ein, damit es noch heute mit der Spesenerfassung beginnen kann.
*Lade dein Team* zu Expensify ein, damit alle noch heute mit der Spesenerfassung starten können.

1. Klicke auf *Workspaces*.
2. Wähle deinen Workspace aus.
3. Klicke auf *Members* > *Invite member*.
4. Gib E-Mail-Adressen oder Telefonnummern ein.
5. Füge eine eigene Einladung hinzu, wenn du möchtest!
5. Füge eine individuelle Einladung hinzu, wenn du möchtest!

[Zu den Workspace-Mitgliedern](${workspaceMembersLink}).
`),
Expand All @@ -2847,14 +2847,14 @@ ${
title: ({workspaceTagsLink}) => `Richte [Tags](${workspaceTagsLink}) ein`,
description: ({workspaceMoreFeaturesLink}) =>
dedent(`
Verwende Tags, um zusätzliche Spesendetails wie Projekte, Kunden, Standorte und Abteilungen hinzuzufügen. Wenn du mehrere Tag-Ebenen benötigst, kannst du auf den Control-Tarif upgraden.
Verwende Tags, um zusätzliche Ausgabendetails wie Projekte, Kunden, Standorte und Abteilungen hinzuzufügen. Wenn du mehrere Tag-Ebenen benötigst, kannst du auf den Control-Tarif upgraden.

1. Klicke auf *Workspaces*.
2. Wähle deinen Workspace aus.
3. Klicke auf *More features*.
3. Klicke auf *Weitere Funktionen*.
4. Aktiviere *Tags*.
5. Navigiere im Workspace-Editor zu *Tags*.
6. Klicke auf *+ Add tag*, um eigene zu erstellen.
6. Klicke auf *+ Tag hinzufügen*, um eigene Tags zu erstellen.

[Zu den zusätzlichen Funktionen](${workspaceMoreFeaturesLink}).
`),
Expand Down Expand Up @@ -7572,10 +7572,12 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
endReading: 'Lesen beenden',
saveForLater: 'Für später speichern',
totalDistance: 'Gesamtdistanz',
startTitle: 'Foto des Kilometerzähler-Starts',
endTitle: 'Kilometerzähler-Endfoto',
startMessageWeb: 'Füge ein Foto deines Kilometerzählers vom <strong>Beginn</strong> deiner Fahrt hinzu. Ziehe eine Datei hierher oder wähle eine zum Hochladen aus.',
endMessageWeb: 'Fügen Sie ein Foto Ihres Kilometerzählers vom <strong>Ende</strong> Ihrer Fahrt hinzu. Ziehen Sie eine Datei hierher oder wählen Sie eine zum Hochladen aus.',
startTitle: 'Foto des Kilometerzähler-Starts',
endTitle: 'Kilometerzähler-Endfoto',
deleteOdometerPhoto: 'Kilometerzähler-Foto löschen',
deleteOdometerPhotoConfirmation: 'Möchtest du dieses Kilometerzählerfoto wirklich löschen?',
},
},
gps: {
Expand Down
2 changes: 2 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7520,6 +7520,8 @@ const translations = {
totalDistance: 'Total distance',
startTitle: 'Odometer start photo',
endTitle: 'Odometer end photo',
deleteOdometerPhoto: 'Delete odometer photo',
deleteOdometerPhotoConfirmation: 'Are you sure you want to delete this odometer photo?',
startMessageWeb: 'Add a photo of your odometer from the <strong>start</strong> of your trip. Drag a file here or choose one to upload.',
endMessageWeb: 'Add a photo of your odometer from the <strong>end</strong> of your trip. Drag a file here or choose one to upload.',
},
Expand Down
2 changes: 2 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7766,6 +7766,8 @@ ${amount} para ${merchant} - ${date}`,
totalDistance: 'Distancia total',
startTitle: 'Foto inicial del odómetro',
endTitle: 'Foto final del odómetro',
deleteOdometerPhoto: 'Eliminar foto del odómetro',
deleteOdometerPhotoConfirmation: '¿Estás seguro de que deseas eliminar esta foto del odómetro?',
startMessageWeb: 'Añade una foto de tu odómetro al <strong>inicio</strong> de tu viaje. Arrastra un archivo aquí o elige uno para subirlo.',
endMessageWeb: 'Añade una foto de tu odómetro al <strong>final</strong> de tu viaje. Arrastra un archivo aquí o elige uno para subirlo.',
},
Expand Down
14 changes: 8 additions & 6 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2740,7 +2740,7 @@ ${amount} pour ${merchant} - ${date}`,
title: ({workspaceCategoriesLink}) => `Configurer les [catégories](${workspaceCategoriesLink})`,
description: ({workspaceCategoriesLink}) =>
dedent(`
*Configurez des catégories* pour que votre équipe puisse coder les dépenses afin de faciliter les rapports.
*Configurez les catégories* pour que votre équipe puisse coder les dépenses et faciliter le reporting.

1. Cliquez sur *Espaces de travail*.
2. Sélectionnez votre espace de travail.
Expand Down Expand Up @@ -2831,12 +2831,12 @@ ${
title: ({workspaceMembersLink}) => `Invitez [votre équipe](${workspaceMembersLink})`,
description: ({workspaceMembersLink}) =>
dedent(`
*Invitez votre équipe* sur Expensify pour qu’elle puisse commencer à suivre ses dépenses dès aujourd’hui.
*Invitez votre équipe* sur Expensify afin qu’elle puisse commencer à suivre ses dépenses dès aujourd’hui.

1. Cliquez sur *Espaces de travail*.
2. Sélectionnez votre espace de travail.
3. Cliquez sur *Membres* > *Inviter un membre*.
4. Saisissez des adresses e-mail ou des numéros de téléphone.
4. Saisissez des e-mails ou des numéros de téléphone.
5. Ajoutez un message d’invitation personnalisé si vous le souhaitez !

[Aller aux membres de l’espace de travail](${workspaceMembersLink}).
Expand All @@ -2854,7 +2854,7 @@ ${
title: ({workspaceTagsLink}) => `Configurer les [tags](${workspaceTagsLink})`,
description: ({workspaceMoreFeaturesLink}) =>
dedent(`
Utilisez des tags pour ajouter des détails supplémentaires à vos dépenses, comme les projets, clients, lieux et services. Si vous avez besoin de plusieurs niveaux de tags, vous pouvez passer au plan Contrôle.
Utilisez les tags pour ajouter des détails supplémentaires sur les dépenses, comme les projets, les clients, les lieux et les services. Si vous avez besoin de plusieurs niveaux de tags, vous pouvez passer au plan Control.

1. Cliquez sur *Espaces de travail*.
2. Sélectionnez votre espace de travail.
Expand Down Expand Up @@ -7594,11 +7594,13 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
endReading: 'Fin de lecture',
saveForLater: 'Enregistrer pour plus tard',
totalDistance: 'Distance totale',
startTitle: 'Photo du compteur au départ',
endTitle: 'Photo de fin d’odomètre',
startMessageWeb:
'Ajoutez une photo de votre compteur kilométrique prise au <strong>début</strong> de votre trajet. Faites glisser un fichier ici ou choisissez-en un à télécharger.',
endMessageWeb: 'Ajoutez une photo du compteur kilométrique prise à la <strong>fin</strong> de votre trajet. Faites glisser un fichier ici ou choisissez-en un à télécharger.',
startTitle: 'Photo du compteur de départ',
endTitle: 'Photo du compteur (arrivée)',
deleteOdometerPhoto: 'Supprimer la photo du compteur kilométrique',
deleteOdometerPhotoConfirmation: 'Voulez-vous vraiment supprimer cette photo de l’odomètre ?',
},
},
gps: {
Expand Down
38 changes: 20 additions & 18 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2726,11 +2726,11 @@ ${amount} per ${merchant} - ${date}`,
title: ({workspaceCategoriesLink}) => `Configura le [categorie](${workspaceCategoriesLink})`,
description: ({workspaceCategoriesLink}) =>
dedent(`
*Configura le categorie* in modo che il tuo team possa classificare le spese per una rendicontazione più semplice.
*Configura le categorie* in modo che il tuo team possa codificare le spese per creare report facilmente.

1. Fai clic su *Workspaces*.
2. Seleziona il tuo workspace.
3. Fai clic su *Categories*.
1. Fai clic su *Spazi di lavoro*.
2. Seleziona il tuo spazio di lavoro.
3. Fai clic su *Categorie*.
4. Disattiva le categorie di cui non hai bisogno.
5. Aggiungi le tue categorie in alto a destra.

Expand Down Expand Up @@ -2819,11 +2819,11 @@ ${
dedent(`
*Invita il tuo team* su Expensify così potrà iniziare a tracciare le spese oggi stesso.

1. Fai clic su *Spazi di lavoro*.
2. Seleziona il tuo spazio di lavoro.
3. Fai clic su *Membri* > *Invita membro*.
1. Fai clic su *Workspaces*.
2. Seleziona il tuo workspace.
3. Fai clic su *Members* > *Invite member*.
4. Inserisci email o numeri di telefono.
5. Aggiungi un messaggio di invito personalizzato, se vuoi!
5. Aggiungi un messaggio di invito personalizzato se vuoi!

[Portami ai membri dello spazio di lavoro](${workspaceMembersLink}).
`),
Expand All @@ -2840,16 +2840,16 @@ ${
title: ({workspaceTagsLink}) => `Configura i [tag](${workspaceTagsLink})`,
description: ({workspaceMoreFeaturesLink}) =>
dedent(`
Usa i tag per aggiungere dettagli extra alle spese, come progetti, clienti, sedi e reparti. Se ti servono più livelli di tag, puoi eseguire l’upgrade al piano Control.
Usa i tag per aggiungere dettagli extra alle spese, come progetti, clienti, sedi e reparti. Se ti servono più livelli di tag, puoi passare al piano Control.

1. Fai clic su *Workspaces*.
2. Seleziona il tuo workspace.
3. Fai clic su *More features*.
4. Attiva *Tags*.
5. Vai a *Tags* nell’editor del workspace.
6. Fai clic su *+ Add tag* per crearne uno personalizzato.
1. Fai clic su *Spazi di lavoro*.
2. Seleziona il tuo spazio di lavoro.
3. Fai clic su *Altre funzionalità*.
4. Attiva *Tag*.
5. Vai su *Tag* nell’editor dello spazio di lavoro.
6. Fai clic su *+ Aggiungi tag* per creare i tuoi.

[Portami a More features](${workspaceMoreFeaturesLink}).
[Portami alle altre funzionalità](${workspaceMoreFeaturesLink}).

`),
},
Expand Down Expand Up @@ -7560,10 +7560,12 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
endReading: 'Fine lettura',
saveForLater: 'Salva per dopo',
totalDistance: 'Distanza totale',
startTitle: 'Foto iniziale del contachilometri',
endTitle: 'Foto del contachilometri finale',
startMessageWeb: 'Aggiungi una foto del contachilometri all’<strong>inizio</strong> del tuo viaggio. Trascina qui un file oppure scegli un file da caricare.',
endMessageWeb: 'Aggiungi una foto del contachilometri scattata alla <strong>fine</strong> del viaggio. Trascina qui un file oppure scegli un file da caricare.',
startTitle: 'Foto iniziale del contachilometri',
endTitle: 'Foto contachilometri finale',
deleteOdometerPhoto: 'Elimina foto del contachilometri',
deleteOdometerPhotoConfirmation: 'Sei sicuro di voler eliminare questa foto del contachilometri?',
},
},
gps: {
Expand Down
Loading
Loading