Merge branch 'release/core-2' into ss/test-typedoc-core2

Author: SarahSoutoul

packages/chrome-extension/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.9.10
+
+### Patch Changes
+
+- Updated dependencies [[`aaf8cfe`](https://github.com/clerk/javascript/commit/aaf8cfe9bd10e26960b4f4231ec2d2c21864e677)]:
+  - @clerk/clerk-js@5.125.5
+
 ## 2.9.9
 
 ### Patch Changes

packages/chrome-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/chrome-extension",
-  "version": "2.9.9",
+  "version": "2.9.10",
   "description": "Clerk SDK for Chrome extensions",
   "keywords": [
     "auth",

packages/clerk-js/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.125.5
+
+### Patch Changes
+
+- Fix issue where free plans had a monthly/annual toggle. ([#8031](https://github.com/clerk/javascript/pull/8031)) by [@dstaley](https://github.com/dstaley)
+
 ## 5.125.4
 
 ### Patch Changes

packages/clerk-js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-js",
-  "version": "5.125.4",
+  "version": "5.125.5",
   "description": "Clerk JS library",
   "keywords": [
     "clerk",

packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx

@@ -325,7 +325,7 @@ const Header = React.forwardRef<HTMLDivElement, HeaderProps>((props, ref) => {
         </>
       </Flex>
 
-      {plan.annualMonthlyFee ? (
+      {plan.annualMonthlyFee && !plan.isDefault ? (
         <Box
           elementDescriptor={descriptors.planDetailPeriodToggle}
           sx={t => ({

packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx

@@ -381,7 +381,7 @@ const CardHeader = React.forwardRef<HTMLDivElement, CardHeaderProps>((props, ref
         ) : null}
       </Flex>
 
-      {planSupportsAnnual && setPlanPeriod ? (
+      {planSupportsAnnual && !plan.isDefault && setPlanPeriod ? (
         <Box
           elementDescriptor={descriptors.pricingTableCardPeriodToggle}
           sx={t => ({

packages/clerk-js/src/ui/contexts/components/Plans.tsx

@@ -215,7 +215,7 @@ export const usePlansContext = () => {
       const subscription =
         sub ?? (plan ? activeOrUpcomingSubscriptionWithPlanPeriod(plan, selectedPlanPeriod) : undefined);
       let _selectedPlanPeriod = selectedPlanPeriod;
-      const isEligibleForSwitchToAnnual = Boolean(plan?.annualMonthlyFee);
+      const isEligibleForSwitchToAnnual = Boolean(plan?.annualMonthlyFee && !plan.isDefault);
 
       if (_selectedPlanPeriod === 'annual' && !isEligibleForSwitchToAnnual) {
         _selectedPlanPeriod = 'month';

packages/expo/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.19.31
+
+### Patch Changes
+
+- Updated dependencies [[`aaf8cfe`](https://github.com/clerk/javascript/commit/aaf8cfe9bd10e26960b4f4231ec2d2c21864e677)]:
+  - @clerk/clerk-js@5.125.5
+
 ## 2.19.30
 
 ### Patch Changes

packages/expo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clerk/clerk-expo",
-  "version": "2.19.30",
+  "version": "2.19.31",
   "description": "Clerk React Native/Expo library",
   "keywords": [
     "react",