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.

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

Add view transactions cta to Expensify card and company cards page #55095

Merged
merged 15 commits into from
Jan 22, 2025

Conversation

parasharrajat
Copy link
Member

@parasharrajat parasharrajat commented Jan 10, 2025

Explanation of Change

Fixed Issues

$ #54800
PROPOSAL: #54800 (comment)

Tests

Prerequisite:

  1. Login in NewDot with an account which has a workspace.
  2. Enable Expensify Card and Company Card from the Settings > workspaces > [Your workspace] > Workflows.
  3. You have some assigned cards to your account from different workspaces and a assigned company card.

Expensify Card

  1. Go to Expensify card in workspace menu on LHN.
  2. Issue a new Expensify Card if not already.
  3. Click on the card to view details.
  4. Notice the View transactions button.
  5. Click to navigate to the search page with transactions filtered to that card.

Company Card

  1. Go to Company card in workspace menu on LHN.
  2. Add a new Company Card if not already.
  3. Click on the card to view details.
  4. Notice the View transactions button.
  5. Click to navigate to the search page with transactions filtered to that card.

Assigned Cards

  1. Go to Settings > Wallet page.
  2. Click on any assigned cards(Physical or virtual).
  3. Check that it has a View Transactions button.
  4. Click to navigate to the search page with transactions filtered to that card.
  5. Click on any Assigned Company card.
  6. Note that a popup opens with the view transactions button.
  7. Click to navigate to the search page with transactions filtered to that card.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

  • 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 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
15.01.2025_14.13.10_REC.mp4
Android: mWeb Chrome
15.01.2025_14.19.33_REC.mp4
iOS: Native
15.01.2025_14.57.38_REC.mp4
22.01.2025_02.39.11_REC.mp4
iOS: mWeb Safari
15.01.2025_14.16.48_REC.mp4
MacOS: Chrome / Safari
15.01.2025_14.11.28_REC.mp4
22.01.2025_02.31.45_REC.mp4
MacOS: Desktop
15.01.2025_14.12.33_REC.mp4

@parasharrajat parasharrajat changed the title Add view transactions cta to Expnesify card and company cards page Add view transactions cta to Expensify card and company cards page Jan 12, 2025
<MenuItem
icon={Expensicons.MoneySearch}
title={translate('workspace.common.viewTransactions')}
style={styles.mv1}
Copy link
Contributor

Choose a reason for hiding this comment

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

All of these menu items should not have a gap in between them, so I think we need to remove the vertical margin here. Can you make sure all of the menu items are 64px tall with no gaps between? Screenshots would be great, thanks! cc @Expensify/design for viz

Copy link
Member Author

@parasharrajat parasharrajat Jan 15, 2025

Choose a reason for hiding this comment

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

Updated.

Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't quite look right. We want a gap of 12px below the last push row and above the block of optionRows. They should appear like two distinct sections. It's just that we want all of the option rows in the same block to not have any vertical margin.

CleanShot 2025-01-15 at 09 52 14@2x

For the option rows on your second screenshot, why do some have a green icon and others a gray icon? I think we want them all to be gray.

Copy link
Member Author

Choose a reason for hiding this comment

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

I just noticed that the color of icons is different for update card cta. Normally these links will be green on hovering(active state). What should the color be here on default state?

Copy link
Contributor

Choose a reason for hiding this comment

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

Default state would be gray, but then they are green on hover:
CleanShot 2025-01-15 at 10 33 20

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

Copy link
Member Author

Choose a reason for hiding this comment

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

image
image

Copy link
Contributor

Choose a reason for hiding this comment

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

Lovely, thanks!

@parasharrajat parasharrajat marked this pull request as ready for review January 15, 2025 09:29
@parasharrajat parasharrajat requested a review from a team as a code owner January 15, 2025 09:29
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team January 15, 2025 09:29
Copy link

melvin-bot bot commented Jan 15, 2025

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

@@ -2652,6 +2652,7 @@ const translations = {
planType: 'Tipo de plan',
submitExpense: 'Envíe los gastos utilizando el chat de su espacio de trabajo:',
defaultCategory: 'Categoría predeterminada',
viewTransactions: 'Ver transacciones',
Copy link
Contributor

Choose a reason for hiding this comment

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

Did we confirm this translation ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

const queryString = policyID
? `type:${type} status:${Array.isArray(status) ? status.join(',') : status} policyID:${policyID}`
: `type:${type} status:${Array.isArray(status) ? status.join(',') : status}`;
let queryString = `type:${type} status:${Array.isArray(status) ? status.join(',') : status}`;
Copy link
Contributor

Choose a reason for hiding this comment

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

did you try to mock some transaction data and see if we get the search results ?

Copy link
Member Author

@parasharrajat parasharrajat Jan 15, 2025

Choose a reason for hiding this comment

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

This is the same as before. I haven't tested this part. Did you notice any issues?

@allgandalf
Copy link
Contributor

Also please fix failing tests

@mountiny
Copy link
Contributor

Seems like there is still some feedback to address here

@shawnborton
Copy link
Contributor

I think the design feedback has been taken care of, so we're good there. We can also run a test build when we are close to merge to make sure it's looking good.

@parasharrajat
Copy link
Member Author

I have made all requested changes and retested.

Copy link
Contributor

🚧 @mountiny has triggered a test build. You can view the workflow run here.

This comment has been minimized.

@allgandalf
Copy link
Contributor

almost done with testing, gonna mock some onyx data for card transactions and then approve this one

@shawnborton
Copy link
Contributor

shawnborton commented Jan 15, 2025

I wonder if this should also be added to Settings > Wallet > Card details?
Wallet

That would make sense to me but I don't feel strongly.

@parasharrajat
Copy link
Member Author

One thing worth mentioning is that the card filter does not work for the cards that are owned by someone else. Even though I can see the card in my list when I the admin of a workspace but the search page does not show card filters for it.

@dannymcclain
Copy link
Contributor

I wonder if this should also be added to Settings > Wallet > Card details?
That would make sense to me but I don't feel strongly.

I don't feel strongly either but agree it would make sense. Can't think of a reason not to add it here other than it's more work.

@mountiny
Copy link
Contributor

I wonder if this should also be added to Settings > Wallet > Card details?

Yes I think we should

@parasharrajat
Copy link
Member Author

Changes done. Its ready.

@shawnborton
Copy link
Contributor

Nice, let us know when we have updated screenshots/videos to review as well. We need them from Workspace Editor as well as Wallet > Cards

@parasharrajat
Copy link
Member Author

@allgandalf This is ready for testing.

@parasharrajat
Copy link
Member Author

parasharrajat commented Jan 21, 2025

I will share screenshots shortly. @allgandalf Can you please start testing this in the meantime?

@parasharrajat
Copy link
Member Author

Closed mistakenly...

Copy link
Contributor

🚧 @mountiny has triggered a test build. You can view the workflow run here.

Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/55095/index.html ❌ FAILED ❌
Android The QR code can't be generated, because the iOS build failed
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/55095/NewExpensify.dmg https://55095.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@parasharrajat
Copy link
Member Author

parasharrajat commented Jan 21, 2025

Vids for web and native for wallet page. Others are attached to OP. cc: @shawnborton

22.01.2025_02.39.11_REC.mp4
22.01.2025_02.31.45_REC.mp4

@mountiny
Copy link
Contributor

Seems to test well for me!

Screen.Recording.2025-01-21.at.23.38.29.mp4

@mountiny
Copy link
Contributor

@allgandalf how is it looking?

@shawnborton
Copy link
Contributor

Looks great!

shawnborton
shawnborton previously approved these changes Jan 22, 2025
@allgandalf
Copy link
Contributor

allgandalf commented Jan 22, 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 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.

Screenshots/Videos

Android: Native
Screen.Recording.2025-01-22.at.12.40.12.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-01-22.at.12.42.16.PM.mov
iOS: Native
Screen.Recording.2025-01-22.at.12.31.27.PM.mov
iOS: mWeb Safari
Screen.Recording.2025-01-22.at.12.33.03.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-01-22.at.12.19.57.PM.mov
MacOS: Desktop
Screen.Recording.2025-01-22.at.12.24.07.PM.mov

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

Code LGTM and tests well

@mountiny
Copy link
Contributor

@parasharrajat can you please resolve the conflicts

@parasharrajat
Copy link
Member Author

@mountiny Done,.

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

@mountiny mountiny merged commit 4dc7c7a into Expensify:main Jan 22, 2025
17 checks passed
@OSBotify
Copy link
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.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.89-0 🚀

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

Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.89-8 🚀

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

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

Successfully merging this pull request may close these issues.

6 participants