diff --git a/src/languages/en.js b/src/languages/en.js index 39fafd4d7da9..16881b8972e6 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -338,6 +338,7 @@ export default { notFound: { chatYouLookingForCannotBeFound: 'The chat you are looking for cannot be found.', getMeOutOfHere: 'Get me out of here', + iouReportNotFound: 'The payment details you are looking for cannot be found.', }, setPasswordPage: { enterPassword: 'Enter a password', diff --git a/src/languages/es.js b/src/languages/es.js index c04745f36511..b04569177139 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -336,8 +336,9 @@ export default { createGroup: 'Crear Grupo', }, notFound: { - chatYouLookingForCannotBeFound: 'No se pudo encontrar el chat que estabas buscando.', + chatYouLookingForCannotBeFound: 'El chat que estás buscando no se ha podido encontrar.', getMeOutOfHere: 'Sácame de aquí', + iouReportNotFound: 'Los detalles del pago que estás buscando no se han podido encontrar.', }, setPasswordPage: { enterPassword: 'Escribe una contraseña', diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 9976e32ca4ab..da0a72dae33d 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -461,11 +461,17 @@ function removeOptimisticActions(reportID) { * * @param {Number} iouReportID - ID of the report we are fetching * @param {Number} chatReportID - associated chatReportID, set as an iouReport field + * @param {Boolean} [shouldRedirectIfEmpty=false] - Whether to redirect to Active Report Screen if IOUReport is empty * @returns {Promise} */ -function fetchIOUReportByID(iouReportID, chatReportID) { +function fetchIOUReportByID(iouReportID, chatReportID, shouldRedirectIfEmpty = false) { return fetchIOUReport(iouReportID, chatReportID) .then((iouReportObject) => { + if (!iouReportObject && shouldRedirectIfEmpty) { + Growl.error(translateLocal('notFound.iouReportNotFound')); + Navigation.navigate(ROUTES.REPORT); + return; + } setLocalIOUReportData(iouReportObject); return iouReportObject; }); diff --git a/src/pages/iou/IOUDetailsModal.js b/src/pages/iou/IOUDetailsModal.js index 17be9bc16467..822149b4a5d3 100644 --- a/src/pages/iou/IOUDetailsModal.js +++ b/src/pages/iou/IOUDetailsModal.js @@ -107,7 +107,7 @@ class IOUDetailsModal extends Component { componentDidMount() { this.isComponentMounted = true; - fetchIOUReportByID(this.props.route.params.iouReportID, this.props.route.params.chatReportID); + fetchIOUReportByID(this.props.route.params.iouReportID, this.props.route.params.chatReportID, true); this.addVenmoPaymentOptionIfAvailable(); this.addExpensifyPaymentOptionIfAvailable(); }