Skip to content

fix: format amount before navigating to next page #22728

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

Merged
puneetlath merged 2 commits into from
Jul 21, 2023
Merged

fix: format amount before navigating to next page #22728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2332843
format amount before navigating to next page
kushu7 Jul 12, 2023
abb18c3
added common function for saving amount
kushu7 Jul 13, 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: 21 additions & 6 deletions src/pages/iou/steps/MoneyRequestAmountPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,24 @@ function MoneyRequestAmountPage(props) {
});
};

/**
* Convert amount to whole unit and update selection
*
* @param {String} currencyCode
* @param {Number} amountInCurrencyUnits
*/
const saveAmountToState = (currencyCode, amountInCurrencyUnits) => {
if (!currencyCode || !amountInCurrencyUnits) {
return;
}
const amountAsStringForState = CurrencyUtils.convertToWholeUnit(currencyCode, amountInCurrencyUnits).toString();
setAmount(amountAsStringForState);
setSelection({
start: amountAsStringForState.length,
end: amountAsStringForState.length,
});
};

useEffect(() => {
if (isEditing.current) {
if (prevMoneyRequestID.current !== props.iou.id) {
Expand Down Expand Up @@ -270,12 +288,7 @@ function MoneyRequestAmountPage(props) {
}, [props.iou.currency]);

useEffect(() => {
const selectedAmountAsStringForState = props.iou.amount ? CurrencyUtils.convertToWholeUnit(props.iou.currency, props.iou.amount).toString() : '';
setAmount(selectedAmountAsStringForState);
setSelection({
start: selectedAmountAsStringForState.length,
end: selectedAmountAsStringForState.length,
});
saveAmountToState(props.iou.currency, props.iou.amount);
}, [props.iou.amount, props.iou.currency]);

useFocusEffect(
Expand Down Expand Up @@ -369,6 +382,8 @@ function MoneyRequestAmountPage(props) {
IOU.setMoneyRequestAmount(amountInSmallestCurrencyUnits);
IOU.setMoneyRequestCurrency(selectedCurrencyCode);

saveAmountToState(selectedCurrencyCode, amountInSmallestCurrencyUnits);

if (isEditing.current) {
Navigation.goBack(ROUTES.getMoneyRequestConfirmationRoute(iouType.current, reportID.current));
return;
Expand Down