Skip to content

Add feed syntax key - #57454

Merged
luacmartins merged 21 commits into
Expensify:mainfrom
software-mansion-labs:add-feed-syntax-key
Mar 6, 2025
Merged

luacmartins merged 21 commits into
Expensify:mainfrom
software-mansion-labs:add-feed-syntax-key

Conversation

@JakubKorytko

Copy link
Copy Markdown
Member

Explanation of Change

Fixed Issues

$ #56855
PROPOSAL: N/A

Tests

  1. Click on the search anywhere in the application.
  2. Type in feed: followed by existing card feed (workspace or domain).
  3. After accepting the search, verify that:
    1. Display name of the feed is visible in the search input.
    2. Query in the URL and request sent to the server contains key feed: fundID_bank.
  1. Click on the advanced search filters anywhere in the application.
  2. Select any feed in theCard row.
  3. Check step 3 in the test above.
  4. Deselect any card from the selected feed and verify that the list of cards is stored in the query instead of the feed.

Offline tests

N/A

QA Steps

Same as tests

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 used JaimeGPT to get English > Spanish translation. I then posted it 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.ts 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android.mov
Android: mWeb Chrome
iOS: Native
iOS.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Web.mov
MacOS: Desktop
Desktop.mov

@Kicu Kicu left a comment

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.

Good job. There are things that we can improve here, because the code surrounding cards is already pretty complex, so I think it's worth taking another look.

Also congratz for trying to write some tests 👍


General comment about commiting project.pbxproj: if you have not changed anything in package.json, did not update any dependencies and/or pods - just app code, then do not commit changes to this file - just discard them.

Comment thread tests/unit/cardFeedsTests.ts Resolved
Comment thread src/libs/CardUtils.ts Resolved
Comment thread src/libs/CardUtils.ts Resolved
@JakubKorytko
JakubKorytko marked this pull request as ready for review March 3, 2025 14:34
@JakubKorytko
JakubKorytko requested a review from a team as a code owner March 3, 2025 14:34
@melvin-bot
melvin-bot Bot requested a review from sobitneupane March 3, 2025 14:34
@melvin-bot

melvin-bot Bot commented Mar 3, 2025

Copy link
Copy Markdown

@sobitneupane 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team March 3, 2025 14:34
Comment thread Mobile-Expensify Resolved

@sobitneupane sobitneupane left a comment

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.

@JakubKorytko As you can see in the following video, we display the suggestion feed:"All Expensify", but clicking on it does nothing. I believe that since feed:"All Expensify" is already selected, we should not show this suggestion.

We don't show the suggestion when a card is selected.

Screen.Recording.2025-03-05.at.13.13.22.mov

Steps To Reproduce the issue:

  1. Click on the search anywhere in the application.
  2. Type in feed: followed by existing card feed (workspace or domain) and select it.
  3. Click on the search bar in the expense page.

@sobitneupane

Copy link
Copy Markdown
Contributor

The app crashes when feedName does not exist.

Screen.Recording.2025-03-05.at.13.34.34.mov

@sobitneupane

Copy link
Copy Markdown
Contributor

Initially, the feed name was "All Expensify", but it changed to "All Expensify - WS". After clearing the cache, it reverted to "All Expensify". Could this be due to a backend and frontend sync issue?

Screenshot 2025-03-05 at 14 56 23 Screenshot 2025-03-05 at 14 56 55

@luacmartins luacmartins left a comment

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.

Code is looking good. We just need to get rid of the submodule change. I feel like that'll create issues if we leave it in

@Kicu

Kicu commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

@luacmartins are worried that even if the hash is correct now, but there is a commit changing this hash in history that will cause some problems?

@Kicu Kicu left a comment

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.

2 small comments

Comment thread src/libs/FeedUtils.ts Resolved
Comment thread src/libs/CardUtils.ts Resolved

@sobitneupane sobitneupane left a comment •

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.

Thanks for the changes @JakubKorytko

I noticed that the Feed name used under Card in Advanced Filters is different from the actual feed name. This might be related to this issue, but I'm not entirely sure.

Screen.Recording.2025-03-06.at.13.46.14.mov

@sobitneupane sobitneupane left a comment •

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.

Screenshots/Videos

Android: Native
Screen.Recording.2025-03-06.at.14.16.16.mov
Android: mWeb Chrome
Screen.Recording.2025-03-06.at.14.19.43.mov
iOS: Native
Screen.Recording.2025-03-06.at.19.36.41.mov
iOS: mWeb Safari
Screen.Recording.2025-03-06.at.14.26.59.mov
MacOS: Chrome / Safari
Screen.Recording.2025-03-06.at.13.51.39.mov
Screen.Recording.2025-03-06.at.13.53.09.mov
MacOS: Desktop
Screen.Recording.2025-03-06.at.14.36.39.mov

@luacmartins

Copy link
Copy Markdown
Contributor

@luacmartins are worried that even if the hash is correct now, but there is a commit changing this hash in history that will cause some problems?

I think that should be fine.

luacmartins
luacmartins previously approved these changes Mar 6, 2025

@luacmartins luacmartins left a comment

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.

LGTM!

@JakubKorytko

Copy link
Copy Markdown
Member Author

I've applied fixes according to @Kicu comment.

I noticed that the Feed name used under Card in Advanced Filters is different from the actual feed name. This might be related to #57454 (comment), but I'm not entirely sure.

Initially, the feed name was "All Expensify", but it changed to "All Expensify - WS". After clearing the cache, it reverted to "All Expensify". Could this be due to a backend and frontend sync issue?

I think I found problem mentioned by @sobitneupane and fixed it, from my tests it seems to work correctly now.

@luacmartins
luacmartins requested review from Kicu and sobitneupane March 6, 2025 12:27
@luacmartins

Copy link
Copy Markdown
Contributor

Nice, let's review this again @sobitneupane @Kicu

@sobitneupane

sobitneupane commented Mar 6, 2025 •

Copy link
Copy Markdown
Contributor

@JakubKorytko I can still reproduce this issue.

Reproduction steps:

  1. Create or Navigate to an workspace and assign Expensify Cards to its members.
  2. Search feed:, and "feed: All Expensify" is suggested.
  3. Navigate to another workspace> Expensify Cards.
  4. Now search feed:, and "feed: All Expensify- {workspace_name}" is suggested.

I was able to reproduce this issue in staging as well, so it does not appear to be related to this PR.

I also believe this issue is related to this issue.

@luacmartins Is this the expected behavior?

@sobitneupane sobitneupane left a comment

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.

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 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.

@luacmartins

Copy link
Copy Markdown
Contributor

I was able to reproduce this issue in staging as well, so it does not appear to be related to this PR.

I also believe #57454 (review) is related to #57454 (comment).

@luacmartins Is this the expected behavior?

I don't think so, but if this behavior is reproducible in staging, we don't need to block this PR on it

@melvin-bot
melvin-bot Bot requested a review from luacmartins March 6, 2025 14:10
@luacmartins
luacmartins merged commit 1e2e5c7 into Expensify:main Mar 6, 2025
@OSBotify

OSBotify commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

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

@github-actions github-actions Bot mentioned this pull request Mar 6, 2025
93 tasks done
@github-actions

github-actions Bot commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.1.10-0 🚀

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

@github-actions

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.10-6 🚀

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

onChangeText={(value) => {
setSearchTerm(value);
}}
showLoadingPlaceholder

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.

Coming from: #58886, we should show the loading indicator only when data is loading

Comment thread src/libs/CardFeedUtils.ts
return [];
}

return domainFeedCards[cardFeedKey].filter((cardNumber) => cards[cardNumber].state !== CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED);

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.

domainFeedCards[cardFeedKey] may not exist which would result in an exception. We fixed this in #73529

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.

7 participants