From eb9700bba433363056bd1b9c994e0f68d979d52b Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 12 Jun 2023 10:26:15 +0700 Subject: [PATCH 1/5] Fix email and default avatar shows on detail split bill page --- src/pages/iou/SplitBillDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js index d4e5cc85d3fb..d17bc6a5ec16 100644 --- a/src/pages/iou/SplitBillDetailsPage.js +++ b/src/pages/iou/SplitBillDetailsPage.js @@ -66,7 +66,7 @@ const SplitBillDetailsPage = (props) => { const reportAction = props.reportActions[`${props.route.params.reportActionID.toString()}`]; const personalDetails = OptionsListUtils.getPersonalDetailsForLogins(reportAction.originalMessage.participants, props.personalDetails); const participants = OptionsListUtils.getParticipantsOptions(reportAction.originalMessage, personalDetails); - const payeePersonalDetails = _.filter(participants, (participant) => participant.login === reportAction.actorEmail)[0]; + const payeePersonalDetails = _.filter(personalDetails, (participant) => participant.login === reportAction.actorEmail)[0]; const participantsExcludingPayee = _.filter(participants, (participant) => participant.login !== reportAction.actorEmail); const splitAmount = parseInt(lodashGet(reportAction, 'originalMessage.amount', 0), 10); const splitComment = lodashGet(reportAction, 'originalMessage.comment'); From aa484545f46b1921daf7ce9fb068df3f3ed05a5b Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 13 Jun 2023 09:19:21 +0700 Subject: [PATCH 2/5] get payee detail by object key instead of filter --- src/pages/iou/SplitBillDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js index d17bc6a5ec16..994b3acbf745 100644 --- a/src/pages/iou/SplitBillDetailsPage.js +++ b/src/pages/iou/SplitBillDetailsPage.js @@ -66,7 +66,7 @@ const SplitBillDetailsPage = (props) => { const reportAction = props.reportActions[`${props.route.params.reportActionID.toString()}`]; const personalDetails = OptionsListUtils.getPersonalDetailsForLogins(reportAction.originalMessage.participants, props.personalDetails); const participants = OptionsListUtils.getParticipantsOptions(reportAction.originalMessage, personalDetails); - const payeePersonalDetails = _.filter(personalDetails, (participant) => participant.login === reportAction.actorEmail)[0]; + const payeePersonalDetails = personalDetails[reportAction.actorEmail]; const participantsExcludingPayee = _.filter(participants, (participant) => participant.login !== reportAction.actorEmail); const splitAmount = parseInt(lodashGet(reportAction, 'originalMessage.amount', 0), 10); const splitComment = lodashGet(reportAction, 'originalMessage.comment'); From bdfbe429a106ccc7941b2b60c7c44e23f86106f4 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 00:44:40 +0700 Subject: [PATCH 3/5] use filter with new migration personal details --- src/pages/iou/SplitBillDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js index 994b3acbf745..d4e5cc85d3fb 100644 --- a/src/pages/iou/SplitBillDetailsPage.js +++ b/src/pages/iou/SplitBillDetailsPage.js @@ -66,7 +66,7 @@ const SplitBillDetailsPage = (props) => { const reportAction = props.reportActions[`${props.route.params.reportActionID.toString()}`]; const personalDetails = OptionsListUtils.getPersonalDetailsForLogins(reportAction.originalMessage.participants, props.personalDetails); const participants = OptionsListUtils.getParticipantsOptions(reportAction.originalMessage, personalDetails); - const payeePersonalDetails = personalDetails[reportAction.actorEmail]; + const payeePersonalDetails = _.filter(participants, (participant) => participant.login === reportAction.actorEmail)[0]; const participantsExcludingPayee = _.filter(participants, (participant) => participant.login !== reportAction.actorEmail); const splitAmount = parseInt(lodashGet(reportAction, 'originalMessage.amount', 0), 10); const splitComment = lodashGet(reportAction, 'originalMessage.comment'); From 1280cb07eee7ee930eea7a320d933edd5fbe30a8 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 00:46:08 +0700 Subject: [PATCH 4/5] fix bug payee detail --- src/pages/iou/SplitBillDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js index d4e5cc85d3fb..d17bc6a5ec16 100644 --- a/src/pages/iou/SplitBillDetailsPage.js +++ b/src/pages/iou/SplitBillDetailsPage.js @@ -66,7 +66,7 @@ const SplitBillDetailsPage = (props) => { const reportAction = props.reportActions[`${props.route.params.reportActionID.toString()}`]; const personalDetails = OptionsListUtils.getPersonalDetailsForLogins(reportAction.originalMessage.participants, props.personalDetails); const participants = OptionsListUtils.getParticipantsOptions(reportAction.originalMessage, personalDetails); - const payeePersonalDetails = _.filter(participants, (participant) => participant.login === reportAction.actorEmail)[0]; + const payeePersonalDetails = _.filter(personalDetails, (participant) => participant.login === reportAction.actorEmail)[0]; const participantsExcludingPayee = _.filter(participants, (participant) => participant.login !== reportAction.actorEmail); const splitAmount = parseInt(lodashGet(reportAction, 'originalMessage.amount', 0), 10); const splitComment = lodashGet(reportAction, 'originalMessage.comment'); From bee970df2be8bdf3d821fb5d9dde443c93d05b13 Mon Sep 17 00:00:00 2001 From: dukenv0307 <129500732+dukenv0307@users.noreply.github.com> Date: Fri, 16 Jun 2023 05:06:27 +0700 Subject: [PATCH 5/5] Update src/pages/iou/SplitBillDetailsPage.js Co-authored-by: Rajat Parashar --- src/pages/iou/SplitBillDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/SplitBillDetailsPage.js b/src/pages/iou/SplitBillDetailsPage.js index 5ea54e1bd3fa..d3f1847b373a 100644 --- a/src/pages/iou/SplitBillDetailsPage.js +++ b/src/pages/iou/SplitBillDetailsPage.js @@ -66,7 +66,7 @@ function SplitBillDetailsPage(props) { const reportAction = props.reportActions[`${props.route.params.reportActionID.toString()}`]; const personalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(reportAction.originalMessage.participantAccountIDs, props.personalDetails); const participants = OptionsListUtils.getParticipantsOptions(reportAction.originalMessage, personalDetails); - const payeePersonalDetails = _.filter(personalDetails, (participant) => participant.accountID === reportAction.actorAccountID)[0]; + const payeePersonalDetails = personalDetails[reportAction.actorAccountID]; const participantsExcludingPayee = _.filter(participants, (participant) => participant.accountID !== reportAction.actorAccountID); const splitAmount = parseInt(lodashGet(reportAction, 'originalMessage.amount', 0), 10); const splitComment = lodashGet(reportAction, 'originalMessage.comment');