[Payment history] add "Request refund" menu item #44138

kubabutkiewicz · 2024-06-21T09:40:38Z

Details

Pre-requisite for the Payment/Subscription testing:

Have a create collect policy.
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)
}, []);

Have an Account with isEligibleForRefund: 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, { isEligibleForRefund: true}); 
   }, []);

Fixed Issues

$ #43283

Tests

Verify that no errors appear in the JS console

Go to Subscription page
Click on Request refund button
Verify that modal shown
Next click Downgrade...
Verify that modal got closed and your account is downgraded

Offline tests

QA Steps

Verify that no errors appear in the JS console

Go to Subscription page
Click on Request refund button
Verify that modal shown
Next click Downgrade...
Verify that modal got closed and your account is downgraded

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…eat/request-refund

melvin-bot · 2024-06-25T07:11:32Z

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

src/pages/settings/Subscription/CardSection/CardSection.tsx

src/hooks/useIsEligibleForRefund.ts

src/libs/API/parameters/RequestRefundParams.ts

src/libs/API/types.ts

src/libs/actions/User.ts

src/pages/settings/Subscription/CardSection/CardSection.tsx

…eat/request-refund

src/pages/settings/Subscription/CardSection/CardSection.tsx

kubabutkiewicz · 2024-06-27T08:48:04Z

@mananjadhav comments resolved

…eat/request-refund

mananjadhav · 2024-06-27T16:46:11Z

@Expensify/design @blimpich @kubabutkiewicz The button text is getting cut off in the modal with Spanish translation.

mananjadhav · 2024-06-27T16:54:27Z

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

android-request-refund-modal.mov

Android: mWeb Chrome

iOS: Native

ios-request-refund-modal.mov

iOS: mWeb Safari

mweb-safari-request-refund-modal.mov

MacOS: Chrome / Safari

web-request-refund-modal.mov

MacOS: Desktop

mananjadhav · 2024-06-27T16:56:27Z

@Expensify/design @blimpich Could we have Request refund, without having View payment history. When I play around with dummy data and this is true, the spacing is an issue. If this case can't exist then nothing needs to be fixed here. But if this is true, @kubabutkiewicz we'll have to fix the padding.

shawnborton · 2024-06-27T17:08:08Z

Hmm I'm not sure if you can have "Request refund" yet not have a payment card.

shawnborton · 2024-06-27T17:09:27Z

Can you show me what the :hover style looks like for that row? Thanks!

blimpich · 2024-06-27T17:21:35Z

Could we have Request refund, without having View payment history?

No, not possible. In order to request a refund you must have a purchase, and if you have a purchase then that means "view payment history" should be visible.

mananjadhav · 2024-06-27T17:25:14Z

Can you show me what the :hover style looks like for that row? Thanks!

@shawnborton Can you check the Mac Chrome/Safari video added ?

Could we have Request refund, without having View payment history?

No, not possible. In order to request a refund you must have a purchase, and if you have a purchase then that means "view payment history" should be visible.

Thanks for confirming.

shawnborton · 2024-06-27T17:30:06Z

Awesome, just checked and the styles look correct to me. Thanks!

…eat/request-refund

mananjadhav · 2024-06-28T12:43:55Z

@Expensify/design @blimpich @kubabutkiewicz The button text is getting cut off in the modal with Spanish translation.

~~@Expensify/design @blimpich @kubabutkiewicz Any thoughts on this~~ Discussion here

…eat/request-refund

kubabutkiewicz · 2024-07-01T09:05:41Z

Posting screenshots with new Spanish translations

blimpich

Right now when I click on the downgrade button we stay on the subscription page, but what we want is for the user to be redirected to the chats page. See this section of the design doc

Clicking “Delete workspace(s) and downgrade” should also drop the user into their chats.

If we don't do this the user will just see a "not found" page once they downgrade.

…eat/request-refund

kubabutkiewicz · 2024-07-02T08:52:48Z

@blimpich done!

mananjadhav · 2024-07-02T09:14:26Z

The redirect is working fine. @blimpich Is this the expected behavior?

web-redirect-to-chat-downgrade.mov

OSBotify · 2024-07-02T16:33:03Z

✋ 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 · 2024-07-03T20:01:03Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.0.4-0 🚀

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

OSBotify · 2024-07-04T22:13:30Z

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-10T10:58:50Z

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

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

OSBotify · 2024-07-15T20:19:47Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

kubabutkiewicz added 5 commits June 21, 2024 11:12

feat: add request refund button

4b11285

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

33521f0

…eat/request-refund

fix: remove mb

6180f1d

fix: lint and ts

4d2b099

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

910c8af

…eat/request-refund

kubabutkiewicz marked this pull request as ready for review June 25, 2024 07:11

kubabutkiewicz requested a review from a team as a code owner June 25, 2024 07:11

melvin-bot bot requested review from rushatgabhane and removed request for a team June 25, 2024 07:11

rezkiy37 reviewed Jun 25, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/CardSection.tsx Outdated Show resolved Hide resolved

rezkiy37 reviewed Jun 25, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/CardSection.tsx Outdated Show resolved Hide resolved

fabioh8010 reviewed Jun 25, 2024

View reviewed changes

mananjadhav reviewed Jun 25, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/CardSection.tsx Show resolved Hide resolved

mananjadhav reviewed Jun 25, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/CardSection.tsx Show resolved Hide resolved

trjExpensify requested review from mananjadhav and removed request for rushatgabhane June 25, 2024 11:32

kubabutkiewicz added 3 commits June 26, 2024 10:19

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

ad314de

…eat/request-refund

fix: resolve comments

a204781

fix: remove unnecesarry code

c32b43b

mananjadhav reviewed Jun 26, 2024

View reviewed changes

src/pages/settings/Subscription/CardSection/CardSection.tsx Outdated Show resolved Hide resolved

fix: resolve comments

11f12fb

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

0ecfe4a

…eat/request-refund

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

b047a17

…eat/request-refund

kubabutkiewicz added 2 commits July 1, 2024 09:31

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

06afbc5

…eat/request-refund

fix: adjust spanish translation

0e6456d

mananjadhav approved these changes Jul 1, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich July 1, 2024 08:32

blimpich requested changes Jul 1, 2024

View reviewed changes

kubabutkiewicz added 3 commits July 2, 2024 09:48

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into f…

ab642f4

…eat/request-refund

fix: lint and ts

1beaec5

fix: navigate to chats after requesting refund

5377600

blimpich approved these changes Jul 2, 2024

View reviewed changes

blimpich merged commit 519d096 into Expensify:main Jul 2, 2024
13 of 14 checks passed

github-actions bot mentioned this pull request Jul 3, 2024

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

lanitochka17 mentioned this pull request Jul 5, 2024

Subscription - "Request refund" button is missing from the subscription page #44899

Closed

6 tasks

melvin-bot bot mentioned this pull request Jul 10, 2024

[HOLD for payment 2024-07-22] [HOLD for payment 2024-07-17] [Payment history] add "Request refund" menu item to the Subscription page (UI) #43283

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment history] add "Request refund" menu item #44138

[Payment history] add "Request refund" menu item #44138

kubabutkiewicz commented Jun 21, 2024 •

edited

Loading

melvin-bot bot commented Jun 25, 2024

kubabutkiewicz commented Jun 27, 2024

mananjadhav commented Jun 27, 2024 •

edited

Loading

mananjadhav commented Jun 27, 2024 •

edited

Loading

mananjadhav commented Jun 27, 2024

shawnborton commented Jun 27, 2024

shawnborton commented Jun 27, 2024

blimpich commented Jun 27, 2024

mananjadhav commented Jun 27, 2024

shawnborton commented Jun 27, 2024

mananjadhav commented Jun 28, 2024 •

edited

Loading

kubabutkiewicz commented Jul 1, 2024

blimpich left a comment

kubabutkiewicz commented Jul 2, 2024

mananjadhav commented Jul 2, 2024

OSBotify commented Jul 2, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

[Payment history] add "Request refund" menu item #44138

[Payment history] add "Request refund" menu item #44138

Conversation

kubabutkiewicz commented Jun 21, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 25, 2024

kubabutkiewicz commented Jun 27, 2024

mananjadhav commented Jun 27, 2024 • edited Loading

mananjadhav commented Jun 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

mananjadhav commented Jun 27, 2024

shawnborton commented Jun 27, 2024

shawnborton commented Jun 27, 2024

blimpich commented Jun 27, 2024

mananjadhav commented Jun 27, 2024

shawnborton commented Jun 27, 2024

mananjadhav commented Jun 28, 2024 • edited Loading

kubabutkiewicz commented Jul 1, 2024

blimpich left a comment

Choose a reason for hiding this comment

kubabutkiewicz commented Jul 2, 2024

mananjadhav commented Jul 2, 2024

OSBotify commented Jul 2, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

kubabutkiewicz commented Jun 21, 2024 •

edited

Loading

mananjadhav commented Jun 27, 2024 •

edited

Loading

mananjadhav commented Jun 27, 2024 •

edited

Loading

mananjadhav commented Jun 28, 2024 •

edited

Loading