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 "Request refund" menu item #44138

Merged
merged 16 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/hooks/useIsEligibleForRefund.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import {useMemo} from 'react';
import {useOnyx} from 'react-native-onyx';
import ONYXKEYS from '@src/ONYXKEYS';

function useIsEligibleForRefund() {
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
const [account] = useOnyx(ONYXKEYS.ACCOUNT);

return useMemo(() => {
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
if (!account) {
return false;
}

return account.isEligibleForRefund;
}, [account]);
}

export default useIsEligibleForRefund;
7 changes: 7 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3292,6 +3292,13 @@ export default {
changeCurrency: 'Change payment currency',
cardNotFound: 'No payment card added',
retryPaymentButton: 'Retry payment',
requestRefund: 'Request refund',
requestRefundModal: {
phrase1: 'Getting a refund is easy, just downgrade your account before your next billing date and you’ll receive a refund.',
phrase2:
'Heads up: Downgrading your account means your workspace(s) will be deleted. This action can’t be undone, but you can always create a new workspace if you change your mind.',
confirm: 'Delete workspace(s) and downgrade',
},
},
yourPlan: {
title: 'Your plan',
Expand Down
7 changes: 7 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3796,6 +3796,13 @@ export default {
changeCurrency: 'Cambiar moneda de pago',
cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
retryPaymentButton: 'Reintentar el pago',
requestRefund: 'Solicitar reembolso',
requestRefundModal: {
phrase1: 'Obtener un reembolso es fácil, simplemente baja tu cuenta de categoría antes de la próxima fecha de facturación y recibirás un reembolso.',
phrase2:
'Atención: Bajar tu cuenta de categoría significa que tu(s) espacio(s) de trabajo será(n) eliminado(s). Esta acción no se puede deshacer, pero siempre puedes crear un nuevo espacio de trabajo si cambias de opinión.',
confirm: 'Eliminar espacio(s) de trabajo y bajar de categoría',
},
},
yourPlan: {
title: 'Tu plan',
Expand Down
3 changes: 3 additions & 0 deletions src/libs/API/parameters/RequestRefundParams.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
type RequestRefundParams = Record<string, unknown>;
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved

export default RequestRefundParams;
1 change: 1 addition & 0 deletions src/libs/API/parameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,4 @@ export type {default as UpdateSubscriptionAutoRenewParams} from './UpdateSubscri
export type {default as UpdateSubscriptionAddNewUsersAutomaticallyParams} from './UpdateSubscriptionAddNewUsersAutomaticallyParams';
export type {default as GenerateSpotnanaTokenParams} from './GenerateSpotnanaTokenParams';
export type {default as UpdateSubscriptionSizeParams} from './UpdateSubscriptionSizeParams';
export type {default as RequestRefundParams} from './RequestRefundParams';
2 changes: 2 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ const WRITE_COMMANDS = {
UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
REQUEST_REFUND: 'User_RefundPurchase',
} as const;

type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
Expand Down Expand Up @@ -455,6 +456,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY]: Parameters.UpdateSubscriptionAddNewUsersAutomaticallyParams;
[WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE]: Parameters.UpdateSubscriptionSizeParams;
[WRITE_COMMANDS.REQUEST_REFUND]: Parameters.RequestRefundParams;
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
};

const READ_COMMANDS = {
Expand Down
5 changes: 5 additions & 0 deletions src/libs/actions/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1023,6 +1023,10 @@ function dismissTrackTrainingModal() {
});
}

function requestRefund() {
API.write(WRITE_COMMANDS.REQUEST_REFUND, {});
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
}

export {
clearFocusModeNotification,
closeAccount,
Expand Down Expand Up @@ -1054,4 +1058,5 @@ export {
clearCustomStatus,
updateDraftCustomStatus,
clearDraftCustomStatus,
requestRefund,
};
79 changes: 62 additions & 17 deletions src/pages/settings/Subscription/CardSection/CardSection.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import React, {useMemo} from 'react';
import React, {useCallback, useMemo, useState} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import ConfirmModal from '@components/ConfirmModal';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
import Section from '@components/Section';
import Text from '@components/Text';
import useIsEligibleForRefund from '@hooks/useIsEligibleForRefund';
import useLocalize from '@hooks/useLocalize';
import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as User from '@libs/actions/User';
import DateUtils from '@libs/DateUtils';
import ONYXKEYS from '@src/ONYXKEYS';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
Expand All @@ -17,33 +22,41 @@ import CardSectionDataEmpty from './CardSectionDataEmpty';
import CardSectionUtils from './utils';

function CardSection() {
const [isRequestRefundModalVisible, setIsRequestRefundModalVisible] = useState(false);
const {translate, preferredLocale} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
const plan = useSubscriptionPlan();
const isEligibleForRefund = useIsEligibleForRefund();
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved

const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.isDefault), [fundList]);

const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);

const requestRefund = useCallback(() => {
User.requestRefund();
setIsRequestRefundModalVisible(false);
}, []);

const nextPaymentDate = !isEmptyObject(privateSubscription) ? CardSectionUtils.getNextBillingDate() : undefined;

const sectionSubtitle = defaultCard && !!nextPaymentDate ? translate('subscription.cardSection.cardNextPayment', {nextPaymentDate}) : translate('subscription.cardSection.subtitle');
const BillingBanner = <PreTrialBillingBanner />;

return (
<Section
title={translate('subscription.cardSection.title')}
subtitle={sectionSubtitle}
isCentralPane
titleStyles={styles.textStrong}
subtitleMuted
banner={BillingBanner}
>
<View style={[styles.mt8, styles.mb3, styles.flexRow]}>
{!isEmptyObject(defaultCard?.accountData) && (
<>
<>
<Section
title={translate('subscription.cardSection.title')}
subtitle={sectionSubtitle}
isCentralPane
titleStyles={styles.textStrong}
subtitleMuted
banner={BillingBanner}
>
<View style={[styles.mt8, styles.mb3, styles.flexRow]}>
{!isEmptyObject(defaultCard?.accountData) && (
<View style={[styles.flexRow, styles.flex1, styles.gap3]}>
<Icon
src={Expensicons.CreditCard}
Expand All @@ -61,13 +74,45 @@ function CardSection() {
})}
</Text>
</View>
<CardSectionActions />
</View>
<CardSectionActions />
</>
)}
{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}
</View>
{!isEmptyObject(defaultCard?.accountData && plan && isEligibleForRefund) && (
<MenuItem
shouldShowRightIcon
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
icon={Expensicons.Bill}
iconStyles={[]}
wrapperStyle={styles.sectionMenuItemTopDescription}
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
style={styles.mt5}
title={translate('subscription.cardSection.requestRefund')}
titleStyle={styles.textStrong}
onPress={() => setIsRequestRefundModalVisible(true)}
/>
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
)}
{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}
</View>
</Section>
</Section>

{isEligibleForRefund && (
<ConfirmModal
title={translate('subscription.cardSection.requestRefund')}
isVisible={isRequestRefundModalVisible}
onConfirm={requestRefund}
onCancel={() => {
setIsRequestRefundModalVisible(false);
}}
prompt={
kubabutkiewicz marked this conversation as resolved.
Show resolved Hide resolved
<>
<Text style={styles.mb4}>{translate('subscription.cardSection.requestRefundModal.phrase1')}</Text>
<Text>{translate('subscription.cardSection.requestRefundModal.phrase2')}</Text>
</>
}
confirmText={translate('subscription.cardSection.requestRefundModal.confirm')}
cancelText={translate('common.cancel')}
danger
/>
)}
</>
);
}

Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/Account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ type Account = {

/** Indicates whether the user can downgrade current subscription plan */
canDowngrade?: boolean;

/** Indicates whether the user can downgrade current subscription plan */
isEligibleForRefund?: boolean;
};

export default Account;
Expand Down
Loading