From fd9c66404a40dcfe5dab75f9aa1f5e64d1f131c4 Mon Sep 17 00:00:00 2001
From: Jessica Lawshe <jessica.lawshe@overleaf.com>
Date: Mon, 3 Oct 2022 08:31:55 -0500
Subject: [PATCH] Merge pull request #9809 from
 overleaf/ii-dashboard-mobile-view-improvements-2

[web] Projects dashboard improvements 2

GitOrigin-RevId: c34e91d55785564638ac1d54412a7e5c350fd410
---
 .../current-plan-widget/commons-plan.tsx      | 35 ++++++-----
 .../current-plan-widget/free-plan.tsx         | 12 ++--
 .../current-plan-widget/group-plan.tsx        | 62 ++++++++++---------
 .../current-plan-widget/individual-plan.tsx   | 52 +++++++++-------
 .../components/modals/edit-tag-modal.tsx      | 16 +++--
 5 files changed, 99 insertions(+), 78 deletions(-)

diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
index 4ad90151c6..f3597887ef 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/commons-plan.tsx
@@ -6,24 +6,29 @@ type CommonsPlanProps = Pick<CommonsPlanSubscription, 'subscription' | 'plan'>
 
 function CommonsPlan({ subscription, plan }: CommonsPlanProps) {
   const { t } = useTranslation()
+  const currentPlanLabel = (
+    <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+  )
 
   return (
-    <Tooltip
-      description={t('commons_plan_tooltip', {
-        plan: plan.name,
-        institution: subscription.name,
-      })}
-      id="commons-plan"
-      overlayProps={{ placement: 'bottom' }}
-    >
-      <a
-        href="/learn/how-to/Overleaf_premium_features"
-        className="current-plan-label"
+    <>
+      <span className="current-plan-label visible-xs">{currentPlanLabel}</span>
+      <Tooltip
+        description={t('commons_plan_tooltip', {
+          plan: plan.name,
+          institution: subscription.name,
+        })}
+        id="commons-plan"
+        overlayProps={{ placement: 'bottom' }}
       >
-        <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />{' '}
-        <span className="info-badge" />
-      </a>
-    </Tooltip>
+        <a
+          href="/learn/how-to/Overleaf_premium_features"
+          className="current-plan-label hidden-xs"
+        >
+          {currentPlanLabel} <span className="info-badge" />
+        </a>
+      </Tooltip>
+    </>
   )
 }
 
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
index 0f0122ecb2..f13f52c089 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/free-plan.tsx
@@ -5,17 +5,18 @@ import * as eventTracking from '../../../../infrastructure/event-tracking'
 
 function FreePlan() {
   const { t } = useTranslation()
+  const currentPlanLabel = (
+    <Trans i18nKey="free_plan_label" components={{ b: <strong /> }} />
+  )
 
-  function handleClick() {
+  const handleClick = () => {
     eventTracking.send('subscription-funnel', 'dashboard-top', 'upgrade')
     eventTracking.sendMB('upgrade-button-click', { source: 'dashboard-top' })
   }
 
   return (
     <>
-      <span className="current-plan-label visible-xs">
-        <Trans i18nKey="free_plan_label" components={{ b: <strong /> }} />
-      </span>
+      <span className="current-plan-label visible-xs">{currentPlanLabel}</span>
       <Tooltip
         description={t('free_plan_tooltip')}
         id="free-plan"
@@ -25,8 +26,7 @@ function FreePlan() {
           href="/learn/how-to/Overleaf_premium_features"
           className="current-plan-label hidden-xs"
         >
-          <Trans i18nKey="free_plan_label" components={{ b: <strong /> }} />{' '}
-          <span className="info-badge" />
+          {currentPlanLabel} <span className="info-badge" />
         </a>
       </Tooltip>{' '}
       <Button
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
index d9ea234198..2d42eab49a 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/group-plan.tsx
@@ -9,38 +9,42 @@ type GroupPlanProps = Pick<
 
 function GroupPlan({ subscription, plan, remainingTrialDays }: GroupPlanProps) {
   const { t } = useTranslation()
+  const currentPlanLabel =
+    remainingTrialDays >= 0 ? (
+      remainingTrialDays === 1 ? (
+        <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
+      ) : (
+        <Trans
+          i18nKey="trial_remaining_days"
+          components={{ b: <strong /> }}
+          values={{ days: remainingTrialDays }}
+        />
+      )
+    ) : (
+      <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+    )
 
   return (
-    <Tooltip
-      description={t(
-        subscription.teamName != null
-          ? 'group_plan_with_name_tooltip'
-          : 'group_plan_tooltip',
-        { plan: plan.name, groupName: subscription.teamName }
-      )}
-      id="group-plan"
-      overlayProps={{ placement: 'bottom' }}
-    >
-      <a
-        href="/learn/how-to/Overleaf_premium_features"
-        className="current-plan-label"
+    <>
+      <span className="current-plan-label visible-xs">{currentPlanLabel}</span>
+      <Tooltip
+        description={t(
+          subscription.teamName != null
+            ? 'group_plan_with_name_tooltip'
+            : 'group_plan_tooltip',
+          { plan: plan.name, groupName: subscription.teamName }
+        )}
+        id="group-plan"
+        overlayProps={{ placement: 'bottom' }}
       >
-        {remainingTrialDays >= 0 ? (
-          remainingTrialDays === 1 ? (
-            <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
-          ) : (
-            <Trans
-              i18nKey="trial_remaining_days"
-              components={{ b: <strong /> }}
-              values={{ days: remainingTrialDays }}
-            />
-          )
-        ) : (
-          <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
-        )}{' '}
-        <span className="info-badge" />
-      </a>
-    </Tooltip>
+        <a
+          href="/learn/how-to/Overleaf_premium_features"
+          className="current-plan-label hidden-xs"
+        >
+          {currentPlanLabel} <span className="info-badge" />
+        </a>
+      </Tooltip>
+    </>
   )
 }
 
diff --git a/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx b/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
index d1d0a871a8..9c9961e2b2 100644
--- a/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
+++ b/services/web/frontend/js/features/project-list/components/current-plan-widget/individual-plan.tsx
@@ -9,33 +9,37 @@ type IndividualPlanProps = Pick<
 
 function IndividualPlan({ plan, remainingTrialDays }: IndividualPlanProps) {
   const { t } = useTranslation()
+  const currentPlanLabel =
+    remainingTrialDays >= 0 ? (
+      remainingTrialDays === 1 ? (
+        <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
+      ) : (
+        <Trans
+          i18nKey="trial_remaining_days"
+          components={{ b: <strong /> }}
+          values={{ days: remainingTrialDays }}
+        />
+      )
+    ) : (
+      <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
+    )
 
   return (
-    <Tooltip
-      description={t('plan_tooltip', { plan: plan.name })}
-      id="individual-plan"
-      overlayProps={{ placement: 'bottom' }}
-    >
-      <a
-        href="/learn/how-to/Overleaf_premium_features"
-        className="current-plan-label"
+    <>
+      <span className="current-plan-label visible-xs">{currentPlanLabel}</span>
+      <Tooltip
+        description={t('plan_tooltip', { plan: plan.name })}
+        id="individual-plan"
+        overlayProps={{ placement: 'bottom' }}
       >
-        {remainingTrialDays >= 0 ? (
-          remainingTrialDays === 1 ? (
-            <Trans i18nKey="trial_last_day" components={{ b: <strong /> }} />
-          ) : (
-            <Trans
-              i18nKey="trial_remaining_days"
-              components={{ b: <strong /> }}
-              values={{ days: remainingTrialDays }}
-            />
-          )
-        ) : (
-          <Trans i18nKey="premium_plan_label" components={{ b: <strong /> }} />
-        )}{' '}
-        <span className="info-badge" />
-      </a>
-    </Tooltip>
+        <a
+          href="/learn/how-to/Overleaf_premium_features"
+          className="current-plan-label hidden-xs"
+        >
+          {currentPlanLabel} <span className="info-badge" />
+        </a>
+      </Tooltip>
+    </>
   )
 }
 
diff --git a/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx b/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx
index 6dd4913343..745cbeae9f 100644
--- a/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx
+++ b/services/web/frontend/js/features/project-list/components/modals/edit-tag-modal.tsx
@@ -98,24 +98,32 @@ export default function EditTagModal({
           <div className="modal-footer-left">
             <Button
               onClick={() => runDeleteTag(tag._id)}
-              bsStyle="primary"
+              bsStyle="danger"
               disabled={isDeleteLoading || isRenameLoading}
             >
-              {isDeleteLoading ? <>{t('deleting')} &hellip;</> : t('delete')}
+              {isDeleteLoading ? (
+                <>{t('deleting')} &hellip;</>
+              ) : (
+                t('delete_folder')
+              )}
             </Button>
           </div>
           <Button
             onClick={onClose}
             disabled={isDeleteLoading || isRenameLoading}
           >
-            {t('cancel')}
+            {t('save_or_cancel-cancel')}
           </Button>
           <Button
             onClick={() => runRenameTag(tag._id)}
             bsStyle="primary"
             disabled={isRenameLoading || isDeleteLoading || !newTagName?.length}
           >
-            {isRenameLoading ? <>{t('saving')} &hellip;</> : t('save_changes')}
+            {isRenameLoading ? (
+              <>{t('saving')} &hellip;</>
+            ) : (
+              t('save_or_cancel-save')
+            )}
           </Button>
         </div>
         {(isDeleteError || isRenameError) && (