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

[Payment history] Add "View payment history" menu item #44119

Merged
merged 19 commits into from
Jun 26, 2024

Conversation

mananjadhav
Copy link
Collaborator

@mananjadhav mananjadhav commented Jun 20, 2024

Details

Pre-requisite for the Payment/Subscription testing:

  1. Have a create collect policy.
  2. To access the subscription page, paste the following link into the browser

https://dev.new.expensify.com:8082/settings/subscription

or add this effect to InitialSettingsPage.tsx

useEffect(() => {
    Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)
}, []);
  1. Have an Account with hasPurchaes: true. If you don't have the account then use the following command to populate the Onxy keys
import Onyx from 'react-native-onyx';

useEffect(() => {
       Onyx.merge(ONYXKEYS.ACCOUNT, { hasPurchases: true}); 
   }, []);

Fixed Issues

$ #43281
PROPOSAL:

Tests

  1. Open an account with the setup mentioned in the details section.
  2. Open the subscription page.
  3. Verify that you can see View payment history link under the card section.
  4. Clicking on the link should redirect you to the Search page: search/all?sortBy=date&sortOrder=desc.
  • Verify that no errors appear in the JS console

Offline tests

Same as Test Steps

QA Steps

Same as Test Steps.

  • 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 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
      • 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-view-payment-history.mov
Android: mWeb Chrome
mweb-chrome-view-payment-history.mov
iOS: Native
ios-view-payment-history.mov
iOS: mWeb Safari
mweb-safari-view-payment-history.mov
MacOS: Chrome / Safari
web-view-payment-history.mov

Spanish translation

web-view-payment-history-es
MacOS: Desktop
desktop-view-payment-history.mov

@mananjadhav
Copy link
Collaborator Author

@Expensify/design @trjExpensify Here's a quick demo of the button. A couple of clarifications:

  1. Can we confirm the Spanish translation: Ver historial de pago.
  2. The icon in the design doc is grey. But across all the app, our menu items generally show the color in green. So can you confirm the color.
  3. The size of the icon on the Card info is a bit bigger than the standard size of the MenuItem. Is that correct? I can't make out from the document.
  4. View Payment History will only show up if the card info exists.
view-payment-history-demo.mov

@trjExpensify
Copy link
Contributor

  1. Can we confirm the Spanish translation: Ver historial de pago

The signed off Spanish translation in the design doc is: Ver historial de pagos

  1. The icon in the design doc is grey. But across all the app, our menu items generally show the color in green. So can you confirm the color.

Are you talking about on hover of the menu item? If so, I agree that should be green when hovering over it like other menu items.

  1. The size of the icon on the Card info is a bit bigger than the standard size of the MenuItem. Is that correct? I can't make out from the document.

We can wait for the design guys, but looks like it was vetted in the PR that introduced it: #42787

  1. View Payment History will only show up if the card info exists.

Technically, I think we're making that call on hasPurchases as a new attribute on the Account Onyx object. It should be outlined in the doc's detailed section though for reference, and @blimpich can confirm!

@shawnborton
Copy link
Contributor

The icon in the design doc is grey.

Yeah, I would just leave this as green for now.

The size of the icon on the Card info is a bit bigger than the standard size of the MenuItem. Is that correct? I can't make out from the document.

Ideally this should look pretty much identical to the rows in Wallet > Bank Accounts

@dannymcclain
Copy link
Contributor

The icon in the design doc is grey. But across all the app, our menu items generally show the color in green. So can you confirm the color.

For this one, it should just be green for now. We've been talking about updating the icon color for our option rows to gray, but I think we need to just do that in one fell swoop globally. So what's in your video looks correct to me.

The size of the icon on the Card info is a bit bigger than the standard size of the MenuItem. Is that correct? I can't make out from the document.

Can you explain a bit more what you mean by this? We're wanting to follow the same pattern here that we use on the Wallet page in the Bank accounts section. Your video looks right to me, except there shouldn't be any space between the two items. Does this image help at all?
image

@dannymcclain
Copy link
Contributor

LOL @shawnborton. Jinx. 😂

@trjExpensify
Copy link
Contributor

For this one, it should just be green for now. We've been talking about updating the icon color for our option rows to gray, but I think we need to just do that in one fell swoop globally. So what's in your video looks correct to me.

fair point, we should do that universally. 👍

@mananjadhav
Copy link
Collaborator Author

mananjadhav commented Jun 20, 2024

Can we confirm the Spanish translation: Ver historial de pago

The signed off Spanish translation in the design doc is: Ver historial de pagos

Yes. Sorry I missed this.

I would just leave this as green for now.

For this one, it should just be green for now.

Cool.

@dannymcclain @shawnborton You can ignore the size question as it's same as Add bank account, with one difference. The Add bank account doesn't have the right arrow, but our View payment history will have considering it redirects to another page.

View Payment History will only show up if the card info exists.

Technically, I think we're making that call on hasPurchases as a new attribute on the Account Onyx object.

I don't see the key in the types/onyx/Account.ts, hence my question.

@trjExpensify
Copy link
Contributor

I don't see the key in the types/onyx/Account.ts, hence my question.

I think we're expecting this frontend PR to add it. The backend PR in auth is deployed.

@blimpich
Copy link
Contributor

Correct, as per the design we need to change the Account object in the frontend to include this attribute (link):

We’ll also need to update the frontend to include hasPurchases as a new attribute on the Account Onyx object here.

@mananjadhav
Copy link
Collaborator Author

Cool. Will add.

@mananjadhav
Copy link
Collaborator Author

mananjadhav commented Jun 21, 2024

@blimpich I am having issues with the search redirect on the mobile screens. I've raised the issue on the slack. https://expensify.slack.com/archives/C02NK2DQWUX/p1718955533814289

Would you be able to help with the same?

@mananjadhav mananjadhav marked this pull request as ready for review June 24, 2024 21:07
@mananjadhav mananjadhav requested a review from a team as a code owner June 24, 2024 21:07
@melvin-bot melvin-bot bot removed the request for review from a team June 24, 2024 21:07
Copy link

melvin-bot bot commented Jun 24, 2024

@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 requested a review from sobitneupane June 24, 2024 21:07
@mananjadhav mananjadhav changed the title [Payment history] add "View payment history" menu item [Payment history] Add "View payment history" menu item Jun 24, 2024
@trjExpensify
Copy link
Contributor

@sobitneupane will you be able to review this today? Thanks!

@rushatgabhane
Copy link
Member

rushatgabhane commented Jun 25, 2024

reviewing

https://expensify.slack.com/archives/C036QM0SLJK/p1719314017975119?thread_ts=1719313925.927199&cid=C036QM0SLJK

@trjExpensify trjExpensify requested review from rushatgabhane and removed request for sobitneupane June 25, 2024 11:31
@rushatgabhane
Copy link
Member

rushatgabhane commented Jun 25, 2024

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: Native image
Screen.Recording.2024-06-26.at.02.20.17.mov
Android: mWeb Chrome

sim broken for mWeb chrome

iOS: Native image
Screen.Recording.2024-06-26.at.02.11.43.mov
iOS: mWeb Safari image
Screen.Recording.2024-06-26.at.01.54.27.mov
MacOS: Chrome / Safari image image
MacOS: Desktop image

Copy link
Member

@rushatgabhane rushatgabhane left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

melvin-bot bot commented Jun 25, 2024

We did not find an internal engineer to review this PR, trying to assign a random engineer to #43281 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot bot requested a review from pecanoro June 25, 2024 23:20
@blimpich blimpich requested review from blimpich and removed request for pecanoro June 25, 2024 23:53
@blimpich
Copy link
Contributor

Ugh I forgot to assign myself to the original issue, feel free to ignore @pecanoro

@blimpich
Copy link
Contributor

blimpich commented Jun 26, 2024

Was able to QA this on my local where I actually ran billing and made sure it showed up and directed me to the search page, where the actual expense did exist. Works! Nice job 👍

Screen.Recording.2024-06-25.at.5.09.35.PM.mov

Co-authored-by: Benjamin Limpich <blimpich@expensify.com>
@blimpich blimpich merged commit 04f6598 into Expensify:main Jun 26, 2024
14 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.

@OSBotify
Copy link
Contributor

OSBotify commented Jul 3, 2024

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.3-7 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

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