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

Fix/37095: Tag list show required #37388

Merged
merged 13 commits into from
Apr 5, 2024
Merged

Fix/37095: Tag list show required #37388

Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c62ad7
fix tag list show required
dukenv0307 Feb 28, 2024
bce6391
fix remove redundant code
dukenv0307 Feb 28, 2024
cd91a49
fix remove redundant logic
dukenv0307 Feb 28, 2024
fc5bebc
fix merge main
dukenv0307 Mar 3, 2024
8cd38b8
fix single tag case
dukenv0307 Mar 3, 2024
cde6014
fix lint
dukenv0307 Mar 3, 2024
247827b
fix create isTagRequired variable
dukenv0307 Mar 3, 2024
7d3a9c6
fix remove isTag
dukenv0307 Mar 3, 2024
f0c955b
fix add canUseViolation
dukenv0307 Mar 5, 2024
5ef00a4
Merge branch 'main' into fix/37095-disabled-tags-are-showing-as-required
dukenv0307 Mar 5, 2024
d3b88b5
fix lint
dukenv0307 Mar 6, 2024
7b00537
fix merge main
dukenv0307 Apr 1, 2024
025be6b
fix conflict
dukenv0307 Apr 1, 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
56 changes: 33 additions & 23 deletions src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {useIsFocused} from '@react-navigation/native';
import {format} from 'date-fns';
import {isUndefined} from 'lodash';
import lodashGet from 'lodash/get';
import PropTypes from 'prop-types';
import React, {Fragment, useCallback, useEffect, useMemo, useReducer, useRef, useState} from 'react';
Expand Down Expand Up @@ -310,7 +311,6 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
const isMerchantRequired = isPolicyExpenseChat && !isScanRequest && shouldShowMerchant;

const isCategoryRequired = canUseViolations && lodashGet(policy, 'requiresCategory', false);
const isTagRequired = canUseViolations && lodashGet(policy, 'requiresTag', false);

useEffect(() => {
if ((!isMerchantRequired && isMerchantEmpty) || !merchantError) {
Expand Down Expand Up @@ -763,28 +763,38 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
shouldShow: shouldShowCategories,
isSupplementary: !isCategoryRequired,
},
..._.map(policyTagLists, ({name}, index) => ({
item: (
<MenuItemWithTopDescription
key={name}
shouldShowRightIcon={!isReadOnly}
title={TransactionUtils.getTagForDisplay(transaction, index)}
description={name}
numberOfLinesTitle={2}
onPress={() =>
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.CREATE, iouType, index, transaction.transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
)
}
style={[styles.moneyRequestMenuItem]}
disabled={didConfirm}
interactive={!isReadOnly}
rightLabel={isTagRequired ? translate('common.required') : ''}
/>
),
shouldShow: shouldShowTags,
isSupplementary: !isTagRequired,
})),
..._.map(policyTagLists, ({name, required}, index) => {
const isTagRequired = !isUndefined(required) && required;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we removed canUseViolations?
And this does not work for single level tags where required is not set for each tag, right?

Copy link
Contributor Author

@dukenv0307 dukenv0307 Mar 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this does not work for single level tags where required is not set for each tag, right?

In single-level tag, it still works because we also have required field. But we have the issue with BE side so that field is not returned correctly (Known issue mentioned here). Below is the data returned from BE side in case of single-level tag:

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we removed canUseViolations

I updated the PR to add the canUseViolations

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is held on backend change as per https://expensify.slack.com/archives/C01GTK53T8Q/p1708948376264389?thread_ts=1708732718.173419&cid=C01GTK53T8Q?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it still on HOLD? What PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MonilBhavsar @akinwale BE is fixed (See comment). I just tested it again and it works well

return {
item: (
<MenuItemWithTopDescription
key={name}
shouldShowRightIcon={!isReadOnly}
title={TransactionUtils.getTagForDisplay(transaction, index)}
description={name}
numberOfLinesTitle={2}
onPress={() =>
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(
CONST.IOU.ACTION.CREATE,
iouType,
index,
transaction.transactionID,
reportID,
Navigation.getActiveRouteWithoutParams(),
),
)
}
style={[styles.moneyRequestMenuItem]}
disabled={didConfirm}
interactive={!isReadOnly}
rightLabel={isTagRequired ? translate('common.required') : ''}
/>
),
shouldShow: shouldShowTags,
isSupplementary: !isTagRequired,
};
}),
{
item: (
<MenuItemWithTopDescription
Expand Down
Loading