Web: Payment alert description changed.

packages/common/components/Article/sub-components/article-payment-alert.js

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React from "react";
 import { inject, observer } from "mobx-react";
 import { withRouter } from "react-router";
 import { useTranslation, Trans } from "react-i18next";
@@ -15,28 +15,13 @@ const PROXY_BASE_URL = combineUrl(
 );
 
 const ArticlePaymentAlert = ({
-  pricePerManager,
   isFreeTariff,
   theme,
-  currencySymbol,
-  setPortalPaymentQuotas,
   currentTariffPlanTitle,
   toggleArticleOpen,
-  tariffPlanTitle,
-  isQuotaLoaded,
-  isQuotasLoaded,
 }) => {
   const { t, ready } = useTranslation("Common");
 
-  useEffect(async () => {
-    if (isFreeTariff && isQuotaLoaded)
-      try {
-        await setPortalPaymentQuotas();
-      } catch (e) {
-        console.error(e);
-      }
-  }, [isQuotaLoaded]);
-
   const onClick = () => {
     const paymentPageUrl = combineUrl(
       PROXY_BASE_URL,
@@ -55,16 +40,11 @@ const ArticlePaymentAlert = ({
   );
 
   const description = isFreeTariff
-    ? pricePerManager && (
+    ? t("Common:GetMoreOptions")
-        <Trans t={t} i18nKey="PerUserMonth" ns="Common">
-          From {{ currencySymbol }}
-          {{ price: pricePerManager }} per admin/power user /month
-        </Trans>
-      )
     : t("Common:PayBeforeTheEndGracePeriod");
 
   const additionalDescription = isFreeTariff
-    ? t("Common:ActivateBusinessPlan", { planName: tariffPlanTitle })
+    ? t("Common:ActivatePremiumFeatures")
     : t("Common:GracePeriodActivated");
 
   const color = isFreeTariff
@@ -73,9 +53,6 @@ const ArticlePaymentAlert = ({
 
   const isShowLoader = !ready;
 
-  if (!isQuotaLoaded) return <></>;
-  if (isFreeTariff && !isQuotasLoaded) return <></>;
-
   return isShowLoader ? (
     <Loaders.Rectangle width="210px" height="88px" />
   ) : (
@@ -95,29 +72,14 @@ const ArticlePaymentAlert = ({
 
 export default withRouter(
   inject(({ auth }) => {
-    const { paymentQuotasStore, currentQuotaStore, settingsStore } = auth;
+    const { currentQuotaStore, settingsStore } = auth;
-    const {
+    const { currentTariffPlanTitle } = currentQuotaStore;
-      currentTariffPlanTitle,
-      isLoaded: isQuotaLoaded,
-    } = currentQuotaStore;
     const { theme, toggleArticleOpen } = settingsStore;
-    const {
-      setPortalPaymentQuotas,
-      planCost,
-      tariffPlanTitle,
-      isLoaded: isQuotasLoaded,
-    } = paymentQuotasStore;
 
     return {
       toggleArticleOpen,
-      setPortalPaymentQuotas,
-      pricePerManager: planCost.value,
       theme,
-      currencySymbol: planCost.currencySymbol,
       currentTariffPlanTitle,
-      tariffPlanTitle,
-      isQuotaLoaded,
-      isQuotasLoaded,
     };
   })(observer(ArticlePaymentAlert))
 );

public/locales/en/Common.json

@@ -7,6 +7,7 @@
   "Actions": "Actions",
   "Activate": "Activate",
   "ActivateBusinessPlan": "Activate {{planName}} plan?",
+  "ActivatePremiumFeatures": "Activate premium features?",
   "Active": "Active",
   "AddButton": "Add",
   "AddFilter": "Add filter",
@@ -109,6 +110,7 @@
   "FullAccess": "Full access",
   "Gigabyte": "GB",
   "GracePeriodActivated": "Grace period activated",
+  "GetMoreOptions": "Get more security and branding options",
   "HasFullAccess": "He has full access to the room",
   "HelpCenter": "Help Center",
   "HideArticleMenu": "Hide menu",