Merge pull request #27014 from overleaf/ii-join-group-copy-improvement-revert

[web] Revert "Copy change on the consent screen when joining a managed group"

GitOrigin-RevId: 0690545a38c362f3cd32ec04bc7e2ae36808ebc3

services/web/app/src/Features/Subscription/SubscriptionLocator.js

@@ -4,6 +4,7 @@
 
 const { callbackifyAll } = require('@overleaf/promise-utils')
 const { Subscription } = require('../../models/Subscription')
+const SubscriptionHelper = require('./SubscriptionHelper')
 const { DeletedSubscription } = require('../../models/DeletedSubscription')
 const logger = require('@overleaf/logger')
 const { AI_ADD_ON_CODE, isStandaloneAiAddOnPlanCode } = require('./AiHelper')
@@ -172,7 +173,8 @@ const SubscriptionLocator = {
 
     const hasActiveGroupSubscription = memberSubscriptions.some(
       subscription =>
-        subscription.recurlyStatus?.state === 'active' && subscription.groupPlan
+        subscription.groupPlan &&
+        SubscriptionHelper.getPaidSubscriptionState(subscription) === 'active'
     )
     if (hasActiveGroupSubscription) {
       // Member of a group plan
@@ -184,7 +186,8 @@ const SubscriptionLocator = {
 
     if (personalSubscription) {
       const hasActivePersonalSubscription =
-        personalSubscription.recurlyStatus?.state === 'active'
+        SubscriptionHelper.getPaidSubscriptionState(personalSubscription) ===
+        'active'
       if (hasActivePersonalSubscription) {
         if (personalSubscription.groupPlan) {
           // Owner of a group plan

services/web/frontend/extracted-translations.json

@@ -1146,10 +1146,10 @@
   "on_free_plan_upgrade_to_access_features": "",
   "one_step_away_from_professional_features": "",
   "only_group_admin_or_managers_can_delete_your_account_1": "",
+  "only_group_admin_or_managers_can_delete_your_account_10": "",
   "only_group_admin_or_managers_can_delete_your_account_3": "",
   "only_group_admin_or_managers_can_delete_your_account_6": "",
   "only_group_admin_or_managers_can_delete_your_account_7": "",
-  "only_group_admin_or_managers_can_delete_your_account_8": "",
   "only_group_admin_or_managers_can_delete_your_account_9": "",
   "only_importer_can_refresh": "",
   "open_action_menu": "",

services/web/locales/en.json

@@ -1505,10 +1505,10 @@
   "ongoing_experiments": "Ongoing experiments",
   "online_latex_editor": "Online LaTeX Editor",
   "only_group_admin_or_managers_can_delete_your_account_1": "By becoming a managed user, your organization will have admin rights over your account and control over your stuff, including the right to close your account and access, delete and share your stuff. As a result:",
+  "only_group_admin_or_managers_can_delete_your_account_10": "If you have an individual subscription, we’ll automatically terminate it and cancel its renewal when your account becomes managed. To request a pro-rata refund for the remainder, please contact Support.",
   "only_group_admin_or_managers_can_delete_your_account_3": "Your group admin and group managers will be able to reassign ownership of your projects to another group member.",
   "only_group_admin_or_managers_can_delete_your_account_6": "Only your group admin or group managers will be able to delete your account or change your account back into an unmanaged account.",
   "only_group_admin_or_managers_can_delete_your_account_7": "Only your group admin or group managers will be able to delete your account or change your account into an unmanaged account.",
-  "only_group_admin_or_managers_can_delete_your_account_8": "We’ll cancel the renewal of your subscription, reach out to Support to request a pro-rata refund. Your individual subscription will be terminated when your account becomes managed.",
   "only_group_admin_or_managers_can_delete_your_account_9": "Once you have become a managed user, <0>you yourself cannot change it back to an unmanaged account</0>. <1>Learn more about managed Overleaf accounts.</1>",
   "only_importer_can_refresh": "Only the person who originally imported this __provider__ file can refresh it.",
   "open_action_menu": "Open __name__ action menu",