Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"framer-motion": "^12.5.0",
"fs-extra": "11.3.0",
"image-type": "^4.1.0",
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.11/libsession_util_nodejs-v0.6.11.tar.gz",
"libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.6.12/libsession_util_nodejs-v0.6.12.tar.gz",
"libsodium-wrappers-sumo": "^0.7.15",
"linkify-it": "^5.0.0",
"lodash": "^4.17.21",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import {
useProBackendProDetails,
type ProcessedProDetails,
} from '../../../../../state/selectors/proBackendData';
import { userSettingsModal } from '../../../../../state/ducks/modalDialog';

type VariantPageProps = {
variant: ProNonOriginatingPageVariant;
Expand Down Expand Up @@ -69,6 +70,8 @@ function ProPageHero({ variant }: VariantPageProps) {
return <ProHeroImage heroText={tr('proCancelSorry')} noColors={true} />;
case 'refund':
return <ProHeroImage heroText={tr('proRefundDescription')} noColors={true} />;
case 'refundRequested':
return <ProHeroImage heroText={tr('proRequestedRefund')} noColors={true} />;
default:
return assertUnreachable(variant, `Unknown pro non originating page variant: ${variant}`);
}
Expand Down Expand Up @@ -404,16 +407,16 @@ const ProInfoBlockRefundTitle = styled.div`
font-weight: 700;
padding-top: var(--margins-xs);
`;
const containerStyle = {
paddingBlock: 'var(--margins-md)',
paddingInline: 'var(--margins-lg)',
gap: 'var(--margins-sm)',
lineHeight: '120%',
};

function ProInfoBlockRefundSessionSupport() {
return (
<PanelButtonGroup
containerStyle={{
paddingBlock: 'var(--margins-md)',
paddingInline: 'var(--margins-lg)',
gap: 'var(--margins-sm)',
}}
>
<PanelButtonGroup containerStyle={containerStyle}>
<ProInfoBlockRefundTitle>
<Localizer token="proRefunding" />
</ProInfoBlockRefundTitle>
Expand All @@ -429,13 +432,7 @@ function ProInfoBlockRefundSessionSupport() {
function ProInfoBlockRefundGooglePlay() {
const { data } = useProBackendProDetailsLocal();
return (
<PanelButtonGroup
containerStyle={{
paddingBlock: 'var(--margins-md)',
paddingInline: 'var(--margins-lg)',
gap: 'var(--margins-sm)',
}}
>
<PanelButtonGroup containerStyle={containerStyle}>
<ProInfoBlockRefundTitle>
<Localizer token="proRefunding" />
</ProInfoBlockRefundTitle>
Expand Down Expand Up @@ -508,6 +505,36 @@ function ProInfoBlockRefund() {
}
}

function ProInfoBlockRefundRequested() {
const { data } = useProBackendProDetailsLocal();
const dispatch = getAppDispatch();

return (
<PanelButtonGroup containerStyle={containerStyle}>
<ProInfoBlockRefundTitle>
<Localizer token="nextSteps" />
</ProInfoBlockRefundTitle>

<Localizer token="proRefundNextSteps" platform={data.providerConstants.platform} />
<ProInfoBlockRefundTitle>
<Localizer token="helpSupport" />
</ProInfoBlockRefundTitle>
<ProInfoBlockDescription
onClick={() =>
showLinkVisitWarningDialog(data.providerConstants.refund_status_url, dispatch)
}
style={{ cursor: 'pointer' }}
>
<Localizer
token="proRefundSupport"
platform={data.providerConstants.platform}
icon={LUCIDE_ICONS_UNICODE.EXTERNAL_LINK_ICON}
/>
</ProInfoBlockDescription>
</PanelButtonGroup>
);
}

function ProInfoBlock({ variant }: VariantPageProps) {
switch (variant) {
case 'upgrade':
Expand All @@ -518,6 +545,8 @@ function ProInfoBlock({ variant }: VariantPageProps) {
return <ProInfoBlockCancel />;
case 'refund':
return <ProInfoBlockRefund />;
case 'refundRequested':
return <ProInfoBlockRefundRequested />;
case 'renew':
return <ProInfoBlockRenew />;
default:
Expand Down Expand Up @@ -589,6 +618,27 @@ function ProPageButtonRefund() {
);
}

function ProPageButtonRefundRequested() {
const dispatch = getAppDispatch();

return (
<SessionButton
{...proButtonProps}
buttonColor={SessionButtonColor.Primary}
onClick={() => {
dispatch(
userSettingsModal({
userSettingsPage: 'pro',
})
);
}}
dataTestId="pro-refund-return-button"
>
<Localizer token="theReturn" />
</SessionButton>
);
}

function ProPageButton({ variant }: VariantPageProps) {
switch (variant) {
case 'upgrade':
Expand All @@ -600,6 +650,8 @@ function ProPageButton({ variant }: VariantPageProps) {
return <ProPageButtonCancel />;
case 'refund':
return <ProPageButtonRefund />;
case 'refundRequested':
return <ProPageButtonRefundRequested />;
default:
return assertUnreachable(variant, `Unknown pro non originating page variant: ${variant}`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,18 @@ function ProSettings({ state }: SectionProps) {
title: { token: 'proAccessLoading' },
description: { token: 'proAccessLoadingDescription' },
})
: userSettingsModal({
userSettingsPage: 'proNonOriginating',
nonOriginatingVariant: 'update',
overrideBackAction: returnToThisModalAction,
centerAlign,
})
: data.isProcessingRefund
? userSettingsModal({
userSettingsPage: 'proNonOriginating',
nonOriginatingVariant: 'refundRequested',
overrideBackAction: state.returnToThisModalAction,
})
: userSettingsModal({
userSettingsPage: 'proNonOriginating',
nonOriginatingVariant: 'update',
overrideBackAction: returnToThisModalAction,
centerAlign,
})
);
};

Expand All @@ -481,29 +487,43 @@ function ProSettings({ state }: SectionProps) {
return null;
}

let subText: TrArgs;
if (isError) {
subText = { token: 'errorLoadingProAccess' };
} else if (isLoading) {
subText = { token: 'proAccessLoadingEllipsis' };
} else if (data.isProcessingRefund) {
subText = { token: 'processingRefundRequest', platform: data.providerConstants.platform };
} else if (data.inGracePeriod) {
subText = { token: 'proRenewalUnsuccessful' };
} else if (data.autoRenew) {
subText = { token: 'proAutoRenewTime', time: data.expiryTimeRelativeString };
} else {
subText = { token: 'proExpiringTime', time: data.expiryTimeRelativeString };
}

return (
<SectionFlexContainer>
<PanelLabelWithDescription title={{ token: 'proSettings' }} />
<PanelButtonGroup>
<SettingsChevronBasic
baseDataTestId="update-access"
text={{ token: 'updateAccess' }}
subText={{
token: isError
? 'errorLoadingProAccess'
: isLoading
? 'proAccessLoadingEllipsis'
: data.inGracePeriod
? 'proRenewalUnsuccessful'
: data.autoRenew
? 'proAutoRenewTime'
: 'proExpiringTime',
time: data.expiryTimeRelativeString,
}}
onClick={handleUpdateAccessClick}
loading={isLoading}
subTextColor={isError || data.inGracePeriod ? 'var(--warning-color)' : undefined}
/>
{data.isProcessingRefund ? (
<PanelIconButton
text={{ token: 'proRequestedRefund' }}
dataTestId="update-access-settings-button"
onClick={handleUpdateAccessClick}
iconElement={<PanelIconLucideIcon unicode={LUCIDE_ICONS_UNICODE.CIRCLE_ALERT} />}
rowReverse
/>
) : (
<SettingsChevronBasic
baseDataTestId="update-access"
text={{ token: 'updateAccess' }}
subText={subText}
onClick={handleUpdateAccessClick}
loading={isLoading}
subTextColor={isError || data.inGracePeriod ? 'var(--warning-color)' : undefined}
/>
)}
<SettingsToggleBasic
baseDataTestId="pro-badge-visible"
text={{ token: 'proBadge' }}
Expand Down
1 change: 1 addition & 0 deletions ts/react.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ declare module 'react' {
| 'pro-open-platform-website'
| 'pro-backend-error-retry'
| 'pro-backend-error-support'
| 'pro-refund-return'
| `${ConfirmButtons}-confirm`
| `${CancelButtons}-cancel`
| `clear-${ClearButtons}`
Expand Down
4 changes: 4 additions & 0 deletions ts/state/selectors/proBackendData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ type ProAccessDetails = {
currentStatus: ProStatus;
autoRenew: boolean;
inGracePeriod: boolean;
isProcessingRefund: boolean;
variant: ProAccessVariant;
variantString: string;
expiryTimeMs: number;
Expand Down Expand Up @@ -225,11 +226,14 @@ function processProBackendData({
inGracePeriod = autoRenew && now >= beginAutoRenew && now < expiryTimeMs;
}

const isProcessingRefund = !!data?.refund_requested_unix_ts_ms;

return {
data: {
currentStatus: data?.status ?? defaultProAccessDetailsSourceData.currentStatus,
autoRenew,
inGracePeriod,
isProcessingRefund,
variant,
variantString: proAccessVariantToString(variant),
expiryTimeMs,
Expand Down
8 changes: 7 additions & 1 deletion ts/types/ReduxTypes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@

export type PasswordAction = 'set' | 'change' | 'remove';

export type ProNonOriginatingPageVariant = 'upgrade' | 'update' | 'cancel' | 'refund' | 'renew';
export type ProNonOriginatingPageVariant =
| 'upgrade'
| 'update'
| 'cancel'
| 'refund'
| 'refundRequested'
| 'renew';

export type EditProfilePictureModalProps = {
conversationId: string;
Expand Down