Skip to content

Remove call to getReportNameValuePairs() in method getIcons from ReportUtils.ts.#67178

Merged
tgolen merged 21 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/67092
Aug 1, 2025
Merged

Remove call to getReportNameValuePairs() in method getIcons from ReportUtils.ts.#67178
tgolen merged 21 commits intoExpensify:mainfrom
Krishna2323:krishna2323/issue/67092

Conversation

@Krishna2323
Copy link
Copy Markdown
Contributor

@Krishna2323 Krishna2323 commented Jul 25, 2025

Explanation of Change

Fixed Issues

$ #67092
PROPOSAL: #67092 (comment)

Tests

  1. Create a workspace
  2. Open the report from the workspace settings page under Submit your expenses below:
  3. Verify the multiple icon is show (workspace icon and user icon)
  4. Go back to workspace overview page > Select Delete from the more menu on top right > Confirm
  5. Open the report from the step 2 > Verify only workspace icon is show
  • Verify that no errors appear in the JS console

Offline tests

  1. Create a workspace
  2. Open the report from the workspace settings page under Submit your expenses below:
  3. Verify the multiple icon is show (workspace icon and user icon)
  4. Go back to workspace overview page > Select Delete from the more menu on top right > Confirm
  5. Open the report from the step 2 > Verify only workspace icon is show

QA Steps

  1. Create a workspace
  2. Open the report from the workspace settings page under Submit your expenses below:
  3. Verify the multiple icon is show (workspace icon and user icon)
  4. Go back to workspace overview page > Select Delete from the more menu on top right > Confirm
  5. Open the report from the step 2 > Verify only workspace icon is show
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android_native.mp4
Android: mWeb Chrome
android_chrome.mp4
iOS: Native
ios_native.mp4
iOS: mWeb Safari
ios_safari.mp4
MacOS: Chrome / Safari
web_chrome.mp4
MacOS: Desktop
desktop_app.mp4

…rtUtils.ts.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
// eslint-disable-next-line deprecation/deprecation
const policy = getPolicy(parentReport.policyID);
const parentReportName = getReportName(parentReport, policy, undefined, undefined);
// No need to pass `isReportArchived`, archived tasks are not shown on reports page
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@DylanDylann, could you also confirm this, please?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

isReportArchived is a check for the first parameter of getIcons function, in this case it is parentReport. So I think we still need to pass isReportArchived

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

updated.

@Krishna2323 Krishna2323 marked this pull request as ready for review July 25, 2025 19:17
@Krishna2323 Krishna2323 requested a review from a team as a code owner July 25, 2025 19:17
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team July 25, 2025 19:17
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Jul 25, 2025

@DylanDylann Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@DylanDylann
Copy link
Copy Markdown
Contributor

DylanDylann commented Jul 26, 2025

@Krishna2323 Ops, it seems you haven't got an official assignment on the issue. As mentioned in guideline, we need to wait for the official assignment before going to the PR phase (please note in the next time)

// eslint-disable-next-line deprecation/deprecation
const policy = getPolicy(parentReport.policyID);
const parentReportName = getReportName(parentReport, policy, undefined, undefined);
// No need to pass `isReportArchived`, archived tasks are not shown on reports page
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

isReportArchived is a check for the first parameter of getIcons function, in this case it is parentReport. So I think we still need to pass isReportArchived

@DylanDylann
Copy link
Copy Markdown
Contributor

A missing place: getQuickActionDetails

But I notice this function isn't used anywhere in our codebase. So I think we can remove it

const shouldShowSubscript = shouldReportShowSubscript(report, isArchived);
const defaultSubscriptSize = isExpenseRequest(report) ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
const icons = getIcons(reportHeaderData, personalDetails, null, '', -1, policy, invoiceReceiverPolicy);
const icons = getIcons(reportHeaderData, personalDetails, null, '', -1, policy, invoiceReceiverPolicy, isArchived);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In this file, please call isArchivedReport function once

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

updated.

@Krishna2323
Copy link
Copy Markdown
Contributor Author

Ops, it seems you haven't got an official assignment on the issue. As mentioned in guideline, we need to wait for the official assignment before going to the PR phase (please note in the next time)

@Krishna2323 Go ahead, please

I’m really sorry about that. I knew I hadn’t been assigned yet, but I was confused because I got the go-ahead from you, and you had already mentioned that we needed to raise the PR immediately. Sorry again!

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
const policy = getPolicy(parentReport.policyID);
const parentReportName = getReportName(parentReport, policy, undefined, undefined);
const icons = getIcons(parentReport, personalDetails, null, '', -1, policy);
const parentReportNameValuePairs = getReportNameValuePairsFromKey(data, parentReport);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

You are changing the source of data. Is it safe to use ReportNameValuePairs from searchData?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

You're right about that—I thought the report was also coming from searchData. I believe we need to pass reportNameValuePairs from the search page. I’ve updated it accordingly, please check.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, because the reportNameValuePairs from the search are not always available

Screenshot 2025-07-28 at 14 09 01

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I believe we need to pass reportNameValuePairs from the search page.

@Krishna2323 Thanks for the update. We're currently passing a large object as a parameter, but many of its fields aren't actually used. I suggest either integrating the isArchivedReport field directly into the existing data object, or creating a mapper that filters and returns only the necessary fields. This mapper could take a list of keys and return just the corresponding values.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This mapper will be useful in other tasks, so I suggest we implement it here and get this PR merged as soon as possible. That way, others can reuse it for their tasks.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure what the best approach is—whether to use the Onyx selector or integrate the data into the search data object. Either way, we’d still be subscribing to ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS.
I think it's fine as it is. We're already subscribing to the entire ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS collection in some components.

const [reportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, {canBeMissing: true});
const [allPoliciesID] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: (policies) => mapOnyxCollectionItems(policies, (policy) => policy?.id), canBeMissing: false});
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
const expenseReports = useMemo(
() =>
Object.values(allPoliciesID ?? {}).flatMap((policyID) => {
if (!policyID || (policyIDFromProps && policyID !== policyIDFromProps)) {
return [];
}
const reports = getOutstandingReportsForUser(
policyID,
transactionsReports.at(0)?.ownerAccountID ?? currentUserPersonalDetails.accountID,
allReports ?? {},
reportNameValuePairs,
);
return reports;
}),
[allReports, currentUserPersonalDetails.accountID, transactionsReports, allPoliciesID, reportNameValuePairs, policyIDFromProps],
);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@Krishna2323 I think if we're only using ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS to check whether a report is archived, we should add a selector in useOnyx to only get the necessary fields

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@DylanDylann
Copy link
Copy Markdown
Contributor

@Krishna2323 Also please merge the latest main

@DylanDylann
Copy link
Copy Markdown
Contributor

DylanDylann commented Jul 30, 2025

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Screen.Recording.2025-07-30.at.11.37.29.mov
Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

tgolen
tgolen previously approved these changes Jul 30, 2025
@tgolen
Copy link
Copy Markdown
Contributor

tgolen commented Jul 30, 2025

@DylanDylann do you want to take a look at the recent changes? They look fine to me, but I wanted you to see them too.

Comment on lines +175 to +179
if (!all) {
return new Set();
}

const ids = new Set<string>();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
if (!all) {
return new Set();
}
const ids = new Set<string>();
const ids = new Set<string>();
if (!all) {
return ids
}

Copy link
Copy Markdown
Contributor Author

@Krishna2323 Krishna2323 Jul 31, 2025

Choose a reason for hiding this comment

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

updated.

Comment on lines +180 to +185
for (const [key, value] of Object.entries(all)) {
if (isArchivedReport(value)) {
ids.add(key.slice(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS.length));
}
}
return ids;
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
for (const [key, value] of Object.entries(all)) {
if (isArchivedReport(value)) {
ids.add(key.slice(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS.length));
}
}
return ids;
const prefixLength = ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS.length;
for (const [key, value] of Object.entries(all)) {
if (isArchivedReport(value)) {
const reportID = key.slice(prefixLength);
ids.add(reportID);
}
}
return ids;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

updated.

@DylanDylann
Copy link
Copy Markdown
Contributor

@Krishna2323 Minor suggestion. The rest looks fine

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@melvin-bot melvin-bot bot requested a review from tgolen July 31, 2025 08:18
tgolen
tgolen previously approved these changes Jul 31, 2025
@tgolen
Copy link
Copy Markdown
Contributor

tgolen commented Jul 31, 2025

Conflicts

@Krishna2323
Copy link
Copy Markdown
Contributor Author

@tgolen conflicts resolved.

Signed-off-by: krishna2323 <belivethatkg@gmail.com>
@tgolen
Copy link
Copy Markdown
Contributor

tgolen commented Aug 1, 2025

😭 more conflicts. If you can fix them quickly, I will try to merge as soon as I see it!

@tgolen tgolen merged commit 1e5b554 into Expensify:main Aug 1, 2025
18 checks passed
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Aug 1, 2025

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.


const canSendInvoice = useMemo(() => canSendInvoicePolicyUtils(allPolicies as OnyxCollection<OnyxTypes.Policy>, session?.email), [allPolicies, session?.email]);
const isValidReport = !(isEmptyObject(quickActionReport) || isReportArchived);
const isArchivedReport = useReportIsArchived(quickActionReport?.reportID);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@DylanDylann @tgolen This variable is defined twice due to. 2 parallel PRs https://github.com/Expensify/App/pull/67600/files

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Fix is here #67708

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 4, 2025

🚀 Deployed to staging by https://github.com/tgolen in version: 9.1.89-1 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Aug 6, 2025

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.89-21 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants