From e158902b5fcf7ffb7ebebbe427f5ba751fd31fa4 Mon Sep 17 00:00:00 2001
From: Donkoko <nbonev@duck.com>
Date: Thu, 2 May 2024 17:32:47 +0300
Subject: [PATCH] refactor how prices are displayed on the subscription page

---
 .../subscription/current-plan-details.tsx     |  1 +
 app/components/subscription/prices.tsx        | 35 +++++++----
 app/routes/_layout+/settings.subscription.tsx | 60 ++++++++++++++-----
 3 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/app/components/subscription/current-plan-details.tsx b/app/components/subscription/current-plan-details.tsx
index 0a5e343e8..c7a181da1 100644
--- a/app/components/subscription/current-plan-details.tsx
+++ b/app/components/subscription/current-plan-details.tsx
@@ -12,6 +12,7 @@ export const CurrentPlanDetails = () => {
         You’re currently using the <b>{activeProduct?.name}</b> version of Shelf{" "}
         {isTrialSubscription ? " on a free trial" : ""}.
       </p>
+
       <div>
         {subscription?.canceled_at ? (
           <>
diff --git a/app/components/subscription/prices.tsx b/app/components/subscription/prices.tsx
index 47633f5f4..13ae7ebc7 100644
--- a/app/components/subscription/prices.tsx
+++ b/app/components/subscription/prices.tsx
@@ -64,7 +64,12 @@ export const Price = ({
   const isFreePlan = price.id != "free";
   const features = price.product.metadata.features?.split(",") || [];
 
-  // icons to be mapped with different plans
+  const amount =
+    price.unit_amount != null
+      ? price?.recurring?.interval === "year"
+        ? price.unit_amount / 10
+        : price.unit_amount
+      : null;
 
   return (
     <div className="subscription-plan mb-12 w-full xl:mb-0 xl:max-w-[410px]">
@@ -96,16 +101,24 @@ export const Price = ({
               </div>
             ) : null}
           </div>
-          {price.unit_amount != null ? (
-            <div className=" mb-3 text-4xl font-semibold text-gray-900">
-              {(price.unit_amount / 100).toLocaleString("en-US", {
-                style: "currency",
-                currency: price.currency,
-                maximumFractionDigits: 0,
-              })}
-              {price.recurring ? (
-                <span>/{shortenIntervalString(price.recurring.interval)}</span>
-              ) : null}
+          {amount != null ? (
+            <div className="mb-3 ">
+              <div className=" text-4xl font-semibold text-gray-900">
+                {(amount / 100).toLocaleString("en-US", {
+                  style: "currency",
+                  currency: price.currency,
+                  maximumFractionDigits: 0,
+                })}
+                {price.recurring ? <span>/mo</span> : null}
+              </div>
+              <div className="text-gray-500">
+                {price?.recurring?.interval === "year" &&
+                  `Billed annually ${(amount / 10).toLocaleString("en-US", {
+                    style: "currency",
+                    currency: price.currency,
+                    maximumFractionDigits: 0,
+                  })}`}
+              </div>
             </div>
           ) : null}
           <p className="min-h-[48px] text-base text-gray-600">
diff --git a/app/routes/_layout+/settings.subscription.tsx b/app/routes/_layout+/settings.subscription.tsx
index 34d55c1bb..23589e663 100644
--- a/app/routes/_layout+/settings.subscription.tsx
+++ b/app/routes/_layout+/settings.subscription.tsx
@@ -7,12 +7,14 @@ import { json, redirect } from "@remix-run/node";
 import { Link, useLoaderData } from "@remix-run/react";
 import { z } from "zod";
 import { InfoIcon } from "~/components/icons/library";
+import { Button } from "~/components/shared/button";
 import {
   Tabs,
   TabsContent,
   TabsList,
   TabsTrigger,
 } from "~/components/shared/tabs";
+import { WarningBox } from "~/components/shared/warning-box";
 import { CurrentPlanDetails } from "~/components/subscription/current-plan-details";
 import { CustomerPortalForm } from "~/components/subscription/customer-portal-form";
 import { Prices } from "~/components/subscription/prices";
@@ -196,21 +198,44 @@ export const handle = {
 export default function UserPage() {
   const { title, subTitle, prices, subscription } =
     useLoaderData<typeof loader>();
+  const isLegacyPricing =
+    subscription?.items?.data[0]?.price?.metadata.legacy === "true";
 
   return (
     <>
       <div className=" flex flex-col">
-        <div className="mb-8 mt-3 flex items-center gap-3 rounded border border-gray-300 p-4">
-          <div className="inline-flex items-center justify-center rounded-full border-[5px] border-solid border-primary-50 bg-primary-100 p-1.5 text-primary">
-            <InfoIcon />
+        <div className="mb-8 mt-3">
+          <div className="mb-2 flex items-center gap-3 rounded border border-gray-300 p-4">
+            <div className="inline-flex items-center justify-center rounded-full border-[5px] border-solid border-primary-50 bg-primary-100 p-1.5 text-primary">
+              <InfoIcon />
+            </div>
+            {!subscription ? (
+              <p className="text-[14px] font-medium text-gray-700">
+                You’re currently using the{" "}
+                <span className="font-semibold">FREE</span> version of Shelf
+              </p>
+            ) : (
+              <CurrentPlanDetails />
+            )}
           </div>
-          {!subscription ? (
-            <p className="text-[14px] font-medium text-gray-700">
-              You’re currently using the{" "}
-              <span className="font-semibold">FREE</span> version of Shelf
-            </p>
-          ) : (
-            <CurrentPlanDetails />
+          {isLegacyPricing && (
+            <WarningBox>
+              <p>
+                You are on a{" "}
+                <Button
+                  to="https://www.shelf.nu/legacy-plan-faq"
+                  target="_blank"
+                  variant="link"
+                >
+                  legacy pricing plan
+                </Button>
+                . We have since updated our pricing plans. <br />
+                You can view the new pricing plans in the customer portal. If
+                you cancel your subscription, you will not be able to renew it.
+                <br />
+                For any questions - get in touch with support
+              </p>
+            </WarningBox>
           )}
         </div>
 
@@ -223,19 +248,24 @@ export default function UserPage() {
         </div>
 
         <Tabs
-          defaultValue={subscription?.items.data[0]?.plan.interval || "month"}
+          defaultValue={subscription?.items.data[0]?.plan.interval || "year"}
           className="flex w-full flex-col"
         >
           <TabsList className="center mx-auto mb-8">
+            <TabsTrigger value="year">
+              Yearly{" "}
+              <span className="ml-2 rounded-[16px] bg-primary-50 px-2 py-1 text-xs font-medium text-primary-700">
+                Save 54%
+              </span>
+            </TabsTrigger>
             <TabsTrigger value="month">Monthly</TabsTrigger>
-            <TabsTrigger value="year">Yearly (2 months free)</TabsTrigger>
           </TabsList>
-          <TabsContent value="month">
-            <Prices prices={prices["month"]} />
-          </TabsContent>
           <TabsContent value="year">
             <Prices prices={prices["year"]} />
           </TabsContent>
+          <TabsContent value="month">
+            <Prices prices={prices["month"]} />
+          </TabsContent>
         </Tabs>
       </div>
       <SuccessfulSubscriptionModal />