From 85ba3658388fc482371d291a41bacc692ac321d8 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Wed, 11 Aug 2021 03:53:49 +0530 Subject: [PATCH 1/3] handle Undefined IOU Id on IOUdetails page --- src/languages/en.js | 3 ++- src/languages/es.js | 3 ++- src/libs/actions/Report.js | 8 +++++++- src/pages/iou/IOUDetailsModal.js | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 39fafd4d7da9..3405e443693b 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -336,8 +336,9 @@ export default { createGroup: 'Create Group', }, notFound: { - chatYouLookingForCannotBeFound: 'The chat you are looking for cannot be found.', + chatYouLookingForCannotBeFound: 'The chat you are looking for can not be found.', getMeOutOfHere: 'Get me out of here', + iouReportNotFound: 'Payment details you are looking for can not be found.', }, setPasswordPage: { enterPassword: 'Enter a password', diff --git a/src/languages/es.js b/src/languages/es.js index c04745f36511..8e982e0fa87a 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: 'No se puede encontrar el chat que estás buscando.', getMeOutOfHere: 'Sácame de aquí', + iouReportNotFound: 'No se pueden encontrar los detalles de pago que está buscando.', }, 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(); } From a79e7993ba590302a80f7d82ec283d917597bcaf Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Thu, 12 Aug 2021 03:15:51 +0530 Subject: [PATCH 2/3] translations --- src/languages/en.js | 4 ++-- src/languages/es.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index 3405e443693b..f1d9a5a462bc 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -336,9 +336,9 @@ export default { createGroup: 'Create Group', }, notFound: { - chatYouLookingForCannotBeFound: 'The chat you are looking for can not be found.', + chatYouLookingForCannotBeFound: 'The chat you are looking for cannot be found.', getMeOutOfHere: 'Get me out of here', - iouReportNotFound: 'Payment details you are looking for can not be found.', + iouReportNotFound: '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 8e982e0fa87a..840a561234b6 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -336,9 +336,9 @@ export default { createGroup: 'Crear Grupo', }, notFound: { - chatYouLookingForCannotBeFound: 'No se puede encontrar el chat que estás buscando.', + chatYouLookingForCannotBeFound: 'No se pudo encontrar el chat que está buscando.', getMeOutOfHere: 'Sácame de aquí', - iouReportNotFound: 'No se pueden encontrar los detalles de pago que está buscando.', + iouReportNotFound: 'No se pudo encontrar los detalles de pago que está buscando.', }, setPasswordPage: { enterPassword: 'Escribe una contraseña', From 109a2c8b4a2fb28137bbcbc4e11e7c5b2e42b4ba Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 13 Aug 2021 03:51:52 +0530 Subject: [PATCH 3/3] translations --- src/languages/en.js | 2 +- src/languages/es.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index f1d9a5a462bc..16881b8972e6 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -338,7 +338,7 @@ export default { notFound: { chatYouLookingForCannotBeFound: 'The chat you are looking for cannot be found.', getMeOutOfHere: 'Get me out of here', - iouReportNotFound: 'Payment details you are looking for cannot be found.', + 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 840a561234b6..b04569177139 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -336,9 +336,9 @@ export default { createGroup: 'Crear Grupo', }, notFound: { - chatYouLookingForCannotBeFound: 'No se pudo encontrar el chat que está buscando.', + chatYouLookingForCannotBeFound: 'El chat que estás buscando no se ha podido encontrar.', getMeOutOfHere: 'Sácame de aquí', - iouReportNotFound: 'No se pudo encontrar los detalles de pago que está buscando.', + iouReportNotFound: 'Los detalles del pago que estás buscando no se han podido encontrar.', }, setPasswordPage: { enterPassword: 'Escribe una contraseña',