From 0c636c613c8f144ad49b5192c18ba9889c688e09 Mon Sep 17 00:00:00 2001
From: Gaurav Singh <gaurav3017@gmail.com>
Date: Fri, 20 Sep 2024 15:07:43 +0530
Subject: [PATCH] fix(sdk): remove fetch plan from confirm-change (#779)

* fix: remove additional API call and fetch data from props

* chore: remove console.log

* fix: update plans fetch

* chore: rearrange imports

* chore: remove extra comma

---------

Co-authored-by: Rishabh Mishra <me@rsbh.dev>
---
 .../plans/confirm-change/index.tsx            | 26 ++++++++-----------
 .../organization/plans/helpers/index.ts       |  2 +-
 .../organization/plans/pricing-column.tsx     |  4 +--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx b/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
index c285aae9a..9405e6de0 100644
--- a/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
+++ b/sdks/js/packages/core/react/components/organization/plans/confirm-change/index.tsx
@@ -1,21 +1,21 @@
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Dialog, Flex, Text, Image, Separator, Button } from '@raystack/apsara';
-import styles from '../../organization.module.css';
+import Skeleton from 'react-loading-skeleton';
 import { useNavigate, useParams } from '@tanstack/react-router';
+import * as _ from 'lodash';
 import cross from '~/react/assets/cross.svg';
 import { useFrontier } from '~/react/contexts/FrontierContext';
-import { useCallback, useEffect, useState } from 'react';
 import dayjs from 'dayjs';
 import {
   DEFAULT_DATE_FORMAT,
   DEFAULT_PLAN_UPGRADE_MESSAGE
 } from '~/react/utils/constants';
 import { V1Beta1Plan } from '~/src';
-import Skeleton from 'react-loading-skeleton';
 import { getPlanChangeAction, getPlanNameWithInterval } from '~/react/utils';
 import planStyles from '../plans.module.css';
 import { usePlans } from '../hooks/usePlans';
 import { toast } from 'sonner';
-import * as _ from 'lodash';
+import styles from '../../organization.module.css';
 
 export default function ConfirmPlanChange() {
   const navigate = useNavigate({ from: '/plans/confirm-change/$planId' });
@@ -25,7 +25,6 @@ export default function ConfirmPlanChange() {
     isActivePlanLoading,
     config,
     client,
-    fetchActiveSubsciption,
     activeSubscription,
     basePlan,
     allPlans
@@ -42,6 +41,8 @@ export default function ConfirmPlanChange() {
     checkBasePlan
   } = usePlans();
 
+  const currentPlan = useMemo(() => allPlans.find((plan) => plan.id === planId), [ allPlans, planId ])
+
   const isNewPlanBasePlan = checkBasePlan(planId);
 
   const newPlanMetadata = newPlan?.metadata as Record<string, number>;
@@ -54,10 +55,6 @@ export default function ConfirmPlanChange() {
 
   const cancel = useCallback(() => navigate({ to: '/plans' }), [navigate]);
 
-  useEffect(() => {
-    fetchActiveSubsciption();
-  }, [fetchActiveSubsciption]);
-
   const planChangeSlug =
     activePlan?.name && newPlan?.name
       ? `${activePlan?.name}:${newPlan?.name}`
@@ -115,13 +112,12 @@ export default function ConfirmPlanChange() {
   ]);
 
   const getPlan = useCallback(
-    async (planId: string) => {
+    () => {
       setIsNewPlanLoading(true);
       try {
-        const resp = isNewPlanBasePlan
-          ? { data: { plan: basePlan } }
-          : await client?.frontierServiceGetPlan(planId);
-        const plan = resp?.data?.plan;
+        const plan = isNewPlanBasePlan
+          ? basePlan
+          : currentPlan
         if (plan) {
           setNewPlan(plan);
         }
@@ -139,7 +135,7 @@ export default function ConfirmPlanChange() {
 
   useEffect(() => {
     if (planId) {
-      getPlan(planId);
+      getPlan();
     }
   }, [getPlan, planId]);
 
diff --git a/sdks/js/packages/core/react/components/organization/plans/helpers/index.ts b/sdks/js/packages/core/react/components/organization/plans/helpers/index.ts
index 978c1dc8f..f24442a0d 100644
--- a/sdks/js/packages/core/react/components/organization/plans/helpers/index.ts
+++ b/sdks/js/packages/core/react/components/organization/plans/helpers/index.ts
@@ -1,4 +1,4 @@
-import { V1Beta1Feature, V1Beta1Plan } from '~/src';
+import { V1Beta1Plan } from '~/src';
 import {
   IntervalKeys,
   IntervalPricing,
diff --git a/sdks/js/packages/core/react/components/organization/plans/pricing-column.tsx b/sdks/js/packages/core/react/components/organization/plans/pricing-column.tsx
index 6bb970fe8..598851cdd 100644
--- a/sdks/js/packages/core/react/components/organization/plans/pricing-column.tsx
+++ b/sdks/js/packages/core/react/components/organization/plans/pricing-column.tsx
@@ -1,9 +1,10 @@
+import Skeleton from 'react-loading-skeleton';
 import { useNavigate } from '@tanstack/react-router';
 import { useFrontier } from '~/react/contexts/FrontierContext';
 import dayjs from 'dayjs';
 import { toast } from 'sonner';
 import * as _ from 'lodash';
-import { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Button, Flex, Text, ToggleGroup, Image } from '@raystack/apsara';
 import {
@@ -23,7 +24,6 @@ import checkCircle from '~/react/assets/check-circle.svg';
 import Amount from '~/react/components/helpers/Amount';
 
 import plansStyles from './plans.module.css';
-import Skeleton from 'react-loading-skeleton';
 
 interface PricingColumnHeaderProps {
   plan: PlanIntervalPricing;