Skip to content

fix: incorrect navigate when dismissing tax picker #57555

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
MarioExpensify merged 5 commits into from
Mar 4, 2025
Merged

fix: incorrect navigate when dismissing tax picker #57555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53e1ca5
fix: incorrect navigate when dismissing tax picker
daledah Feb 27, 2025
cf23947
fix: lint
daledah Feb 27, 2025
ed7ba1b
Merge branch 'main' into fix/57233
daledah Mar 3, 2025
d6bb98d
feat: add default onDismiss to Navigation.goBack in TaxPicker
daledah Mar 3, 2025
2f15db4
fix: lint
daledah Mar 3, 2025
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
28 changes: 15 additions & 13 deletions src/components/TaxPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import type {EdgeInsets} from 'react-native-safe-area-context';
import type {ValueOf} from 'type-fest';
import useLocalize from '@hooks/useLocalize';
import useStyleUtils from '@hooks/useStyleUtils';
import * as IOUUtils from '@libs/IOUUtils';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import {shouldUseTransactionDraft} from '@libs/IOUUtils';
import Navigation from '@libs/Navigation/Navigation';
import {getHeaderMessageForNonUserList} from '@libs/OptionsListUtils';
import {getTaxRatesSection} from '@libs/TaxOptionsListUtils';
import type {Tax, TaxRatesOption} from '@libs/TaxOptionsListUtils';
import {getEnabledTaxRateCount} from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import type {IOUAction} from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand All @@ -32,18 +34,18 @@ type TaxPickerProps = {
insets?: EdgeInsets;

/** Callback to fire when a tax is pressed */
onSubmit: (tax: TaxOptionsListUtils.TaxRatesOption) => void;
onSubmit: (tax: TaxRatesOption) => void;

/** The action to take */
action?: IOUAction;

/** The type of IOU */
iouType?: ValueOf<typeof CONST.IOU.TYPE>;

onDismiss: () => void;
onDismiss?: () => void;
};

function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSubmit, action, iouType, onDismiss}: TaxPickerProps) {
function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSubmit, action, iouType, onDismiss = Navigation.goBack}: TaxPickerProps) {
const StyleUtils = useStyleUtils();
const {translate} = useLocalize();
const [searchValue, setSearchValue] = useState('');
Expand All @@ -52,7 +54,7 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
const [transaction] = useOnyx(
(() => {
if (IOUUtils.shouldUseTransactionDraft(action)) {
if (shouldUseTransactionDraft(action)) {
return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
}
return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
Expand All @@ -64,12 +66,12 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;

const taxRates = policy?.taxRates;
const taxRatesCount = TransactionUtils.getEnabledTaxRateCount(taxRates?.taxes ?? {});
const taxRatesCount = getEnabledTaxRateCount(taxRates?.taxes ?? {});
const isTaxRatesCountBelowThreshold = taxRatesCount < CONST.STANDARD_LIST_ITEM_LIMIT;

const shouldShowTextInput = !isTaxRatesCountBelowThreshold;

const selectedOptions = useMemo<TaxOptionsListUtils.Tax[]>(() => {
const selectedOptions = useMemo<Tax[]>(() => {
if (!selectedTaxRate) {
return [];
}
Expand All @@ -85,7 +87,7 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub

const sections = useMemo(
() =>
TaxOptionsListUtils.getTaxRatesSection({
getTaxRatesSection({
policy,
searchValue,
selectedOptions,
Expand All @@ -94,12 +96,12 @@ function TaxPicker({selectedTaxRate = '', policyID, transactionID, insets, onSub
[searchValue, selectedOptions, policy, currentTransaction],
);

const headerMessage = OptionsListUtils.getHeaderMessageForNonUserList((sections.at(0)?.data?.length ?? 0) > 0, searchValue);
const headerMessage = getHeaderMessageForNonUserList((sections.at(0)?.data?.length ?? 0) > 0, searchValue);

const selectedOptionKey = useMemo(() => sections?.at(0)?.data?.find((taxRate) => taxRate.searchText === selectedTaxRate)?.keyForList, [sections, selectedTaxRate]);

const handleSelectRow = useCallback(
(newSelectedOption: TaxOptionsListUtils.TaxRatesOption) => {
(newSelectedOption: TaxRatesOption) => {
if (selectedOptionKey === newSelectedOption.keyForList) {
onDismiss();
return;
Expand Down
14 changes: 7 additions & 7 deletions src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ import ScreenWrapper from '@components/ScreenWrapper';
import TaxPicker from '@components/TaxPicker';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import {updateDistanceTaxRate} from '@libs/actions/Policy/DistanceRate';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import {getDistanceRateCustomUnit} from '@libs/PolicyUtils';
import type * as TaxOptionsListUtils from '@libs/TaxOptionsListUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import type {TaxRatesOption} from '@libs/TaxOptionsListUtils';
import {getWorkspaceTaxesSettingsName} from '@libs/TransactionUtils';
import type {SettingsNavigatorParamList} from '@navigation/types';
import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
import withPolicy from '@pages/workspace/withPolicy';
import * as DistanceRate from '@userActions/Policy/DistanceRate';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
import type SCREENS from '@src/SCREENS';
Expand All @@ -28,17 +28,17 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
const customUnit = getDistanceRateCustomUnit(policy);
const rate = customUnit?.rates[rateID];
const taxRateExternalID = rate?.attributes?.taxRateExternalID;
const selectedTaxRate = taxRateExternalID ? TransactionUtils.getWorkspaceTaxesSettingsName(policy, taxRateExternalID) : undefined;
const selectedTaxRate = taxRateExternalID ? getWorkspaceTaxesSettingsName(policy, taxRateExternalID) : undefined;

const onTaxRateChange = (newTaxRate: TaxOptionsListUtils.TaxRatesOption) => {
const onTaxRateChange = (newTaxRate: TaxRatesOption) => {
if (taxRateExternalID === newTaxRate.code) {
Navigation.goBack();
return;
}
if (!customUnit || !rate) {
return;
}
DistanceRate.updateDistanceTaxRate(policyID, customUnit, [
updateDistanceTaxRate(policyID, customUnit, [
{
...rate,
attributes: {
Expand All @@ -51,7 +51,7 @@ function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTa
};

const dismiss = () => {
Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
Navigation.goBack(ROUTES.WORKSPACE_DISTANCE_RATE_DETAILS.getRoute(policyID, rateID));
};

return (
Expand Down