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

Jump to bottom

Fix/37207: Display not found page instead Tag Page #37747

Merged
merged 6 commits into from
Mar 7, 2024
Merged

Fix/37207: Display not found page instead Tag Page #37747

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6e95368
display not found page in Tag Page
DylanDylann Mar 5, 2024
232a015
fix lint
DylanDylann Mar 5, 2024
54e7abe
fix lint
DylanDylann Mar 5, 2024
c75bb8f
resolve conflict
DylanDylann Mar 7, 2024
614f5a0
lint fix
DylanDylann Mar 7, 2024
7deaf82
add new empty line
DylanDylann Mar 7, 2024
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
8 changes: 6 additions & 2 deletions src/pages/iou/request/step/IOURequestStepTag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import PropTypes from 'prop-types';
import React from 'react';
import React, {useMemo} from 'react';
import {withOnyx} from 'react-native-onyx';
import categoryPropTypes from '@components/categoryPropTypes';
import TagPicker from '@components/TagPicker';
Expand All @@ -11,7 +11,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
import compose from '@libs/compose';
import * as IOUUtils from '@libs/IOUUtils';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as PolicyUtils from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
import {canEditMoneyRequest} from '@libs/ReportUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import reportActionPropTypes from '@pages/home/report/reportActionPropTypes';
Expand Down Expand Up @@ -78,10 +80,12 @@ function IOURequestStepTag({
const tag = TransactionUtils.getTag(transaction, tagIndex);
const isEditing = action === CONST.IOU.ACTION.EDIT;
const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
const parentReportAction = parentReportActions[report.parentReportActionID];
const shouldShowTag = ReportUtils.isGroupPolicy(report) && (transactionTag || OptionsListUtils.hasEnabledTags(policyTagLists));

// eslint-disable-next-line rulesdir/no-negated-variables
const shouldShowNotFoundPage = isEditing && !canEditMoneyRequest(parentReportAction);
const shouldShowNotFoundPage = !shouldShowTag || (isEditing && !canEditMoneyRequest(parentReportAction));

const navigateBack = () => {
Navigation.goBack(backTo);
Expand Down
Loading