Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/PercentageForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function PercentageForm({value: amount, errorText, onInputChange, label, allowEx
textInput.current = newRef;
}}
suffixCharacter="%"
keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
keyboardType={rest.keyboardType ?? CONST.KEYBOARD_TYPE.DECIMAL_PAD}
// On android autoCapitalize="words" is necessary when keyboardType="decimal-pad" or inputMode="decimal" to prevent input lag.
// See https://github.com/Expensify/App/issues/51868 for more information
autoCapitalize="words"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import PercentageForm from '@components/PercentageForm';
import type {SplitListItemType} from '@components/SelectionList/ListItem/types';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import SplitPercentageDisplay from './SplitPercentageDisplay';

type SplitPercentageInputProps = {
Expand Down Expand Up @@ -50,6 +51,7 @@ function SplitPercentageInput({splitItem, contentWidth, percentageDraft, onSplit
allowExceedingHundred
allowDecimal
allowNegative
keyboardType={CONST.KEYBOARD_TYPE.NUMBERS_AND_PUNCTUATION}
/>
);
}
Expand Down
29 changes: 21 additions & 8 deletions src/pages/iou/SplitExpensePage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {deepEqual} from 'fast-equals';
import React, {useMemo} from 'react';
import React, {useEffect, useMemo} from 'react';
import {InteractionManager, Keyboard, View} from 'react-native';
import type {ValueOf} from 'type-fest';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
Expand Down Expand Up @@ -138,6 +138,10 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
const difference = sumOfSplitExpenses - transactionDetailsAmount;
const currencySymbol = getCurrencySymbol(transactionDetails.currency ?? '') ?? transactionDetails.currency ?? CONST.CURRENCY.USD;

useEffect(() => {
setErrorMessage('');
}, [splitExpenses.length]);

const isPerDiem = isPerDiemRequest(transaction);
const isDistance = isDistanceRequest(transaction);
const isCard = isManagedCardTransaction(transaction);
Expand Down Expand Up @@ -168,7 +172,6 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
const currentTransactionViolations = transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
const hasCustomUnitOutOfPolicyViolation = currentTransactionViolations.some((violation) => violation.name === CONST.VIOLATIONS.CUSTOM_UNIT_OUT_OF_POLICY);

const draftTransactionError = useMemo(() => getLatestErrorMessage(draftTransaction ?? {}), [draftTransaction]);
let isUnitRateIDOutOfPolicy = false;
for (const splitExpense of splitExpenses) {
const splitTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(splitExpense.transactionID)}`] ?? transaction;
Expand All @@ -186,6 +189,18 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
}
}

useEffect(() => {
const errorString = getLatestErrorMessage(draftTransaction ?? {});

if (errorString) {
setErrorMessage(errorString);
}
}, [draftTransaction, draftTransaction?.errors]);

useEffect(() => {
setErrorMessage('');
}, [sumOfSplitExpenses, splitExpenses]);

const onAddSplitExpense = () => {
if (draftTransaction?.errors) {
clearSplitTransactionDraftErrors(transactionID);
Expand Down Expand Up @@ -309,7 +324,6 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
};

const onSplitExpenseValueChange = (id: string, value: number, mode: ValueOf<typeof CONST.TAB.SPLIT>) => {
setErrorMessage('');
if (mode === CONST.TAB.SPLIT.AMOUNT || mode === CONST.TAB.SPLIT.DATE) {
const amountInCents = convertToBackendAmount(value);
updateSplitExpenseAmountField(draftTransaction, id, amountInCents, currentPolicy);
Expand Down Expand Up @@ -394,7 +408,6 @@ function SplitExpensePage({route}: SplitExpensePageProps) {
</View>
);

const displayError = errorMessage || draftTransactionError;
let warningMessage = '';

if (invalidSplit && sumOfSplitExpenses !== transactionDetailsAmount) {
Expand All @@ -411,12 +424,12 @@ function SplitExpensePage({route}: SplitExpensePageProps) {

const footerContent = (
<View style={[styles.ph5, styles.pb5]}>
{(!!displayError || !!warningMessage) && (
{(!!errorMessage || !!warningMessage) && (
<FormHelpMessage
style={[styles.ph1, styles.mb2]}
isError={!!displayError}
isInfo={!displayError && !!warningMessage}
message={displayError || warningMessage}
isError={!!errorMessage}
isInfo={!errorMessage && !!warningMessage}
message={errorMessage || warningMessage}
/>
)}
<Button
Expand Down
Loading