Skip to content

Company Cards: Add statement close date to new commercial card feeds#65113

Merged
luacmartins merged 22 commits into
Expensify:mainfrom
s77rt:statement-close-date
Jul 2, 2025
Merged

Company Cards: Add statement close date to new commercial card feeds#65113
luacmartins merged 22 commits into
Expensify:mainfrom
s77rt:statement-close-date

Conversation

@s77rt

@s77rt s77rt commented Jun 27, 2025

Copy link
Copy Markdown
Member

Explanation of Change

Fixed Issues

$ #64484
PROPOSAL:

Tests

  • Have a workspace with company cards enabled
  1. Go to Workspaces > Workspace > Company Cards
  2. Add a new card feed (choose Commercial feed if prompted)
  3. Verify that at the last step you are asked to choose a statement close date
  4. Verify that you can't proceed unless a valid date is selected
  5. Choose a valid date and verify you were able to add the new card feed successfully
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

  • Have a workspace with company cards enabled
  1. Go to Workspaces > Workspace > Company Cards
  2. Add a new card feed
  3. Complete all the steps and verify you were able to add the new card feed successfully
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
    • 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: mWeb Chrome
iOS: Native
Screen.Recording.2025-06-29.at.1.43.50.AM.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-06-29.at.1.42.25.AM.mov
MacOS: Desktop

@s77rt s77rt changed the title Search: Statement close date Company Cards: Add statement close date to new card feeds Jun 28, 2025
@s77rt s77rt marked this pull request as ready for review June 28, 2025 01:36
@s77rt s77rt requested a review from a team as a code owner June 28, 2025 01:36
@melvin-bot melvin-bot Bot requested review from ikevin127 and removed request for a team June 28, 2025 01:36
@melvin-bot

melvin-bot Bot commented Jun 28, 2025

Copy link
Copy Markdown

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

@s77rt

s77rt commented Jun 29, 2025

Copy link
Copy Markdown
Member Author

Found two bugs that I have to address:

  1. On native the submit button is too close to the bottom
  2. The offline indicator overlaps with the submit button
Screenshot 2025-06-29 at 1 23 03 AM Screenshot 2025-06-29 at 1 27 31 AM

@ikevin127 ikevin127 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.

(13) Code review.

Comment thread src/languages/pl.ts
Comment thread src/libs/actions/CompanyCards.ts
const [error, setError] = useState<string | undefined>(undefined);

const sections = useMemo(() => {
const data = [...Array(28).keys()].reduce<CustomCloseDateListItem[]>((days, key) => {

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.

About the 28 days logic, I followed the Slack discussion on this and noted that @JS00001 said:

I assume we'd want to show 31, and then on the BE we would set it to the min of their selected value, or the days in the month

and @JmillsExpensify said:

We can’t show higher than 28 since using higher than that would cause some months to fail, since they don’t have higher than that number.
As a result of that, I’m nearly certain that all banks never close a company card statement on a day other than 1-28.

🟡 My concern is that showing only 28 days regardless of month could confuse users who expect to see all valid days. I'd suggest we add an informational note at the top of the component to let the user know why we only allow 28 selectable days.

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.

An additional concern is that we don't support more than 1-28 on OldDot, so by adding more options now, we're creating a backward compatibility issue. I'm down to add some text if anyone in this PR is passionate, though also worth noting that we've had this behavior in OldDot for years and I'm not aware of this question coming up.

Comment thread src/types/onyx/CardFeeds.ts Outdated
Comment thread src/languages/it.ts Outdated
Comment thread src/languages/pt-BR.ts Outdated
Comment thread src/languages/pt-BR.ts Outdated
Comment thread src/languages/zh-hans.ts Outdated
Comment thread src/languages/zh-hans.ts Outdated
@s77rt s77rt requested a review from ikevin127 June 29, 2025 14:03
@s77rt

s77rt commented Jun 29, 2025

Copy link
Copy Markdown
Member Author

Heads up: The statement close date step is only displayed if you choose Commercial feed. I have asked in slack if we should display that step for Direct feed too.

Edit: I will add the same step for direct feed in a follow up PR

@JS00001 JS00001 self-requested a review June 30, 2025 17:39
@s77rt s77rt changed the title Company Cards: Add statement close date to new card feeds Company Cards: Add statement close date to new commercial card feeds Jun 30, 2025
@ikevin127

ikevin127 commented Jul 1, 2025

Copy link
Copy Markdown
Contributor

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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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.js 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.
  • 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: HybridApp
android-hybrid.mp4
Android: mWeb Chrome
android-mweb.mp4
iOS: HybridApp
ios-hybrid.mp4
iOS: mWeb Safari
ios-mweb.mp4
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

Comment thread src/CONST/index.ts
@melvin-bot melvin-bot Bot requested a review from JS00001 July 1, 2025 22:24

@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.

FYI we already have a similar date picker page for submission frequencies. I think we should align the design of both pages

Screenshot 2025-07-01 at 6 38 18 PM

@s77rt

s77rt commented Jul 1, 2025

Copy link
Copy Markdown
Member Author

@luacmartins Thanks! I can reuse some of that existing logic but the figma design does not include the "Last day of the month" and "Last business day of the month" in the same selection list as the days

@luacmartins

Copy link
Copy Markdown
Contributor

@Expensify/design for opinions on the above. It seems like we have a different existing design for selecting days of month, last day of month, etc

@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.

I'm gonna go ahead and merge this, we can address the design changes (if any) in a follow up

@luacmartins luacmartins merged commit 8cca0a6 into Expensify:main Jul 2, 2025
18 checks passed
@dubielzyk-expensify

Copy link
Copy Markdown
Contributor

FYI we already have a similar date picker page for submission frequencies. I think we should align the design of both pages

Agreed. I prefer the simpler execution in this video where the custom line item goes to a new screen with all the dates

@shawnborton

Copy link
Copy Markdown
Contributor

Definitely agree with that.

@dannymcclain

Copy link
Copy Markdown
Contributor

Sounds good to me!

@github-actions

github-actions Bot commented Jul 3, 2025

Copy link
Copy Markdown
Contributor

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

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

@IuliiaHerets

Copy link
Copy Markdown

@s77rt @luacmartins We haven't a statement close date tab while adding the Company card feed. Is it an issue?

Bug6878216_1751643769750.Screen_Recording_2025-07-04_at_6.39.29_PM.mp4

@s77rt

s77rt commented Jul 5, 2025

Copy link
Copy Markdown
Member Author

@IuliiaHerets No, not an issue. That's the expected result for now because we haven't made the statement close page available in staging/production yet.

@github-actions

github-actions Bot commented Jul 7, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.1.76-5 🚀

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

@s77rt

s77rt commented Jul 15, 2025

Copy link
Copy Markdown
Member Author

I think we still need to change the existing design in submission frequency for consistency #65113 (review)

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.

9 participants