Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add subscriber to money request view to immediately update view #25435

Merged
merged 9 commits into from
Aug 21, 2023
Merged

Add subscriber to money request view to immediately update view #25435

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c9bcc0
add subscriber to MoneyRequestView
luacmartins Aug 17, 2023
116bc17
subscribe to transaction
luacmartins Aug 17, 2023
6fcbc91
add propTypes
luacmartins Aug 17, 2023
b2feefe
fix style
luacmartins Aug 17, 2023
180e4af
create transactionPropTypes
luacmartins Aug 17, 2023
89d117f
resolve conflicts
luacmartins Aug 21, 2023
18da29d
resolve conflicts again
luacmartins Aug 21, 2023
bb0d85e
resolve conflicts #3
luacmartins Aug 21, 2023
42d5925
fix style
luacmartins Aug 21, 2023
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
27 changes: 24 additions & 3 deletions src/components/ReportActionItem/MoneyRequestView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import MenuItemWithTopDescription from '../MenuItemWithTopDescription';
import styles from '../../styles/styles';
import * as ReportUtils from '../../libs/ReportUtils';
import * as ReportActionsUtils from '../../libs/ReportActionsUtils';
import * as TransactionUtils from '../../libs/TransactionUtils';
import * as StyleUtils from '../../styles/StyleUtils';
import CONST from '../../CONST';
import * as Expensicons from '../Icon/Expensicons';
Expand Down Expand Up @@ -46,6 +45,17 @@ const propTypes = {
email: PropTypes.string,
}),

/** The transaction associated with the transactionThread */
transaction: PropTypes.shape({
transactionID: PropTypes.string,
amount: PropTypes.number,
created: PropTypes.string,
comment: PropTypes.shape({
comment: PropTypes.string,
}),
currency: PropTypes.string,
}),

/** Whether we should display the horizontal rule below the component */
shouldShowHorizontalRule: PropTypes.bool.isRequired,

Expand All @@ -58,15 +68,19 @@ const defaultProps = {
session: {
email: null,
},
transaction: {
amount: 0,
currency: CONST.CURRENCY.USD,
comment: {comment: ''},
},
};

function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, policy, session}) {
function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, policy, session, transaction}) {
const {isSmallScreenWidth} = useWindowDimensions();
const {translate} = useLocalize();

const parentReportAction = ReportActionsUtils.getParentReportAction(report);
const moneyRequestReport = parentReport;
const transaction = TransactionUtils.getLinkedTransaction(parentReportAction);
const {created: transactionDate, amount: transactionAmount, currency: transactionCurrency, comment: transactionDescription} = ReportUtils.getTransactionDetails(transaction);
const formattedTransactionAmount = transactionAmount && transactionCurrency && CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);

Expand Down Expand Up @@ -142,5 +156,12 @@ export default compose(
session: {
key: ONYXKEYS.SESSION,
},
transaction: {
key: ({report}) => {
const parentReportAction = ReportActionsUtils.getParentReportAction(report);
const transactionID = lodashGet(parentReportAction, ['originalMessage', 'IOUTransactionID'], 0);
return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
},
},
}),
)(MoneyRequestView);