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.

Sign up for GitHub

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

Skip auto-renew survey for users with no billing history when disabling auto-renew in the Subscription settings #54055

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Skip auto-renew survey for users with no billing history when disabling auto-renew in the Subscription settings #54055

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d8607
Skip auto-renew survey for users with no billing history when disabli…
Shahidullah-Muffakir Dec 12, 2024
8931dbd
fix eslint error
Shahidullah-Muffakir Dec 12, 2024
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
9 changes: 7 additions & 2 deletions src/pages/settings/Subscription/SubscriptionSettings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ function SubscriptionSettings() {
const {translate} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
const preferredCurrency = usePreferredCurrency();
const possibleCostSavings = useSubscriptionPossibleCostSavings();
const [isActingAsDelegate] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.delegatedAccess?.delegate});
const isActingAsDelegate = !!account?.delegatedAccess?.delegate;
const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);

const autoRenewalDate = formatSubscriptionEndDate(privateSubscription?.endDate);
Expand All @@ -41,7 +42,11 @@ function SubscriptionSettings() {
Subscription.updateSubscriptionAutoRenew(true);
return;
}
Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY);
if (account?.hasPurchases) {
Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY);
} else {
Subscription.updateSubscriptionAutoRenew(false);
}
};

const handleAutoIncreaseToggle = () => {
Expand Down
Loading