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: tag name in RHP is not correct #38988

Merged
merged 12 commits into from
Apr 11, 2024
Merged

fix: tag name in RHP is not correct #38988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
89722de
fix tag name in RHP is not correct
tienifr Mar 26, 2024
043972d
fix lint
tienifr Mar 26, 2024
87840c7
fix lint
tienifr Mar 26, 2024
e98a44a
fix lint
tienifr Mar 26, 2024
087a34d
fix use orderWeight instead of tagIndex
tienifr Mar 26, 2024
637c99e
fix merge main
tienifr Mar 28, 2024
2a0dde8
fix conflict
tienifr Apr 1, 2024
85f2cff
fix update getTagListName
tienifr Apr 9, 2024
96d2b66
fix remove {}
tienifr Apr 10, 2024
61c5fa6
fix update variable
tienifr Apr 11, 2024
5f3cd49
fix merge main
tienifr Apr 11, 2024
20d8344
fix lint
tienifr Apr 11, 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
6 changes: 3 additions & 3 deletions src/ROUTES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,16 +369,16 @@ const ROUTES = {
getUrlWithBackToParam(`${action}/${iouType}/scan/${transactionID}/${reportID}`, backTo),
},
MONEY_REQUEST_STEP_TAG: {
route: ':action/:iouType/tag/:tagIndex/:transactionID/:reportID/:reportActionID?',
route: ':action/:iouType/tag/:orderWeight/:transactionID/:reportID/:reportActionID?',
getRoute: (
action: ValueOf<typeof CONST.IOU.ACTION>,
iouType: ValueOf<typeof CONST.IOU.TYPE>,
tagIndex: number,
orderWeight: number,
transactionID: string,
reportID: string,
backTo = '',
reportActionID?: string,
) => getUrlWithBackToParam(`${action}/${iouType}/tag/${tagIndex}/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
) => getUrlWithBackToParam(`${action}/${iouType}/tag/${orderWeight}/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
},
MONEY_REQUEST_STEP_WAYPOINT: {
route: ':action/:iouType/waypoint/:transactionID/:reportID/:pageIndex',
Expand Down
4 changes: 2 additions & 2 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ function MoneyRequestView({
</OfflineWithFeedback>
)}
{shouldShowTag &&
policyTagLists.map(({name}, index) => (
policyTagLists.map(({name, orderWeight}, index) => (
<OfflineWithFeedback
key={name}
pendingAction={getPendingFieldAction('tag')}
Expand All @@ -421,7 +421,7 @@ function MoneyRequestView({
titleStyle={styles.flex1}
onPress={() =>
Navigation.navigate(
ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.REQUEST, index, transaction?.transactionID ?? '', report.reportID),
ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.EDIT, CONST.IOU.TYPE.REQUEST, orderWeight, transaction?.transactionID ?? '', report.reportID),
)
}
brickRoadIndicator={getErrorForField('tag', {tagListIndex: index, tagListName: name}) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Navigation/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ type MoneyRequestNavigatorParamList = {
reportID: string;
backTo: Routes;
reportActionID: string;
tagIndex: string;
orderWeight: string;
};
[SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: {
action: ValueOf<typeof CONST.IOU.ACTION>;
Expand Down
10 changes: 3 additions & 7 deletions src/libs/PolicyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,15 @@ function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagList>): Array<keyof
}

/**
* Gets a tag name of policy tags based on a tag index.
* Gets a tag name of policy tags based on a tag's orderWeight.
*/
function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: number): string {
function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, orderWeight: number): string {
if (isEmptyObject(policyTagList)) {
return '';
}

const policyTagKeys = getSortedTagKeys(policyTagList ?? {});
const policyTagKey = policyTagKeys[tagIndex] ?? '';

return policyTagList?.[policyTagKey]?.name ?? '';
return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight)?.name ?? '';
}

/**
* Gets all tag lists of a policy
*/
Expand Down
2 changes: 1 addition & 1 deletion src/pages/iou/request/step/IOURequestStepTag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function IOURequestStepTag({
policyTags,
report,
route: {
params: {action, tagIndex: rawTagIndex, transactionID, backTo, iouType, reportActionID},
params: {action, orderWeight: rawTagIndex, transactionID, backTo, iouType, reportActionID},
},
transaction,
splitDraftTransaction,
Expand Down
Loading