diff --git a/src/component/product/settingsTab/GeneralTab.jsx b/src/component/product/settingsTab/GeneralTab.jsx
index 26814f6..eb4f642 100644
--- a/src/component/product/settingsTab/GeneralTab.jsx
+++ b/src/component/product/settingsTab/GeneralTab.jsx
@@ -16,7 +16,7 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
     fieldData[item?.setting_key?.toLowerCase().replaceAll(" ", "_")] = item?.setting_value
     })
 
-    // console.log('fieldData', fieldData)
+    console.log('fieldData', fieldData)
 
     const [fields, setFields] = useState(fieldData)
     
@@ -71,20 +71,30 @@ const GeneralTab = memo(({name='Full Name', data, isCustom, productData, backend
                 <form id='tab_form'>
                     <div className="form-row">
                         <>
-                            {Object.entries(data)?.map(([key, value]) => (
-                                <div key={key} className="form-group col-md-12">
-                                    <label htmlFor="name1">{value.name}</label>
-                                    {value.controls == 'TEXT' ?
-                                        <input name={value.name.toLowerCase().replaceAll(" ", "_")} type="text" className="form-control" id={key} value={fields[value.name.toLowerCase().replaceAll(" ", "_")]} onChange={handleChange} />
-                                        :value.controls == 'TEXTAREA' ?
-                                        <textarea name={value.name.toLowerCase().replaceAll(" ", "_")} rows={5} style={{resize: 'none'}} type="text" className="form-control" id={key} value={fields[value.name.toLowerCase().replaceAll(" ", "_")]} onChange={handleChange} />
-                                        : value.controls == 'SELECT_NO_YES' ?
-                                                <NoYesBooleanDropdown />
-                                                :
-                                        null
-                                    }
-                                </div>
-                            ))}
+                            {Object.entries(data)?.map(([key, value]) => {
+                                let fieldName = value.name.toLowerCase().replaceAll(" ", "_")
+                                let fieldValue = fields[value.name.toLowerCase().replaceAll(" ", "_")]
+                                return (
+                                    <div key={key} className="form-group col-md-12">
+                                        <label htmlFor="name1">{value.name}</label>
+                                        {value.controls == 'TEXT' ?
+                                            <input name={fieldName} type="text" className="form-control" id={key} value={fieldValue} onChange={handleChange} />
+                                            :value.controls == 'TEXTAREA' ?
+                                            <textarea name={fieldName} rows={5} style={{resize: 'none'}} type="text" className="form-control" id={key} value={fieldValue} onChange={handleChange} />
+                                            : value.controls == 'SELECT_NO_YES' ?
+                                            // <NoYesBooleanDropdown name={fieldName} value={fieldValue} onChange={handleChange}  />
+                                            <select onChange={handleChange} name={fieldName} value={fieldValue} className="form-control">
+                                                <option value=''>Select</option>
+                                                <option value='0'>No</option>
+                                                <option value='1'>Yes</option>
+                                            </select>
+                                            :
+                                            null
+                                        }
+                                    </div>
+                                )
+                            }
+                            )}
                         </>
                         {reqStatus.message &&
                             <>
diff --git a/src/component/product/settingsTab/NoYesBooleanDropdown.jsx b/src/component/product/settingsTab/NoYesBooleanDropdown.jsx
index 7588440..4d153b0 100644
--- a/src/component/product/settingsTab/NoYesBooleanDropdown.jsx
+++ b/src/component/product/settingsTab/NoYesBooleanDropdown.jsx
@@ -1,7 +1,11 @@
 import React, {memo} from 'react'
 
-export default function NoYesBooleanDropdown() {
+export default function NoYesBooleanDropdown(name, value, onChange) {
     return (
-        <div> Drop Down Here ---- ---- ---- ---- </div>
+        <select onChange={onChange} name={name} value={value} className="form-control">
+            <option value=''>Select</option>
+            <option value='0'>No</option>
+            <option value='1'>Yes</option>
+        </select>
     )
 }
diff --git a/src/component/subscription/Subscription.jsx b/src/component/subscription/Subscription.jsx
index b337356..e11c9cc 100644
--- a/src/component/subscription/Subscription.jsx
+++ b/src/component/subscription/Subscription.jsx
@@ -1,6 +1,9 @@
 import React from 'react'
 import BreadcrumbComBS from "../breadcrumb/BreadcrumbComBS";
 import getImage from "../../utils/getImage";
+import { getSubscriptions } from '../../services/services';
+import { useQuery } from '@tanstack/react-query';
+import queryKeys from '../../services/queryKeys';
 
 export default function Subscription() {
 
@@ -10,52 +13,66 @@ export default function Subscription() {
         premium: { name: 'Premium', price: 20.00, active: true },
     }
 
+    const {data, isFetching, isError, error} = useQuery({
+        queryKey: queryKeys.subscriptions,
+        queryFn: () => {
+            let reqData = {
+                token: localStorage.getItem('token'), // USER TOKEN
+                uid: localStorage.getItem('uid') // USER UID
+            }
+            return getSubscriptions(reqData)
+        }
+    })
+
+    const currentSubscription = data?.data?.current_product
+    const otherSubscriptions = data?.data?.options
+    console.log('urlData', data?.data)
+
     return (
         <>
             <BreadcrumbComBS title='Subscription' paths={['Dashboard', 'Subscription']} />
 
-
-
+        {isFetching ? 
+            <>
+                <div className="col-12">
+                    <p className='text-mute'>Loading...</p>
+                </div>
+            </>
+            : isError ?
+            <div className="col-12">
+                <p className='text-danger'>{error.message}</p>
+            </div>
+            :
             <div className="row">
-                <div className="col-xl-3 col-md-6">
+                <div className="col-12 col-lg-6 col-xl-3">
                     <div className="card card-statistics text-center py-3">
                         <div className="card-body pricing-content">
                             <div className="pricing-content-card">
                                 <h5>Current Subscription(s)</h5>
-                                <h2 className="text-primary pt-3">Basic</h2>
-                                {/*<p className="text-primary pb-3">/ Monthly</p>*/}
-                                {/*<ul className="py-2">*/}
-                                {/*    <li>post jobs</li>*/}
-                                {/*    <li>advanced instructors search</li>*/}
-                                {/*    <li>invite candidates</li>*/}
-                                {/*    <li>post events</li>*/}
-                                {/*    <li>cancel any time</li>*/}
-                                {/*</ul>*/}
-
-
+                                <h2 className="text-primary pt-3">{currentSubscription?.display_name}</h2>
                             </div>
                         </div>
                     </div>
                 </div>
 
                 <>
-                    {Object.entries(pricingFields)?.map(([key, value]) => (
+                    {Object.entries(otherSubscriptions)?.map(([key, value]) => (
 
-                    <div key={key} className="col-xl-3 col-md-6">
+                    <div key={key} className="col-12 col-lg-6 col-xl-3">
                         <div className="card card-statistics text-center py-3">
                             <div className="card-body pricing-content">
                                 <div className="pricing-content-card">
-                                    <h5>{value.name}</h5>
-                                    <h2 className="text-primary pt-3">${value.price}</h2>
+                                    <h5>{value.display_name}</h5>
+                                    <h2 className="text-primary pt-3">${value.monthly}</h2>
                                     <p className="text-primary pb-3">/ Monthly</p>
                                         <ul className="py-2">
-                                            <li>post jobs</li>
-                                            <li>advanced instructors search</li>
-                                            <li>invite candidates</li>
-                                            <li>post events</li>
-                                            <li>cancel any time</li>
+                                            {value?.items?.map(item =>(
+                                            <li key={item}>{item}</li>
+                                            ))}
                                         </ul>
-                                    <div className="pt-2"><a href="javascript:void(0)" className="btn btn-inverse-secondary btn-round btn-sm">go {value.name}</a></div>
+                                    <div className="pt-2">
+                                        <button className="btn btn-inverse-secondary btn-round btn-sm">Go {value.display_name}</button>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -65,7 +82,7 @@ export default function Subscription() {
                 </>
 
             </div>
-
+        }
         </>
     )
 }
diff --git a/src/services/queryKeys.js b/src/services/queryKeys.js
index c641312..000f364 100644
--- a/src/services/queryKeys.js
+++ b/src/services/queryKeys.js
@@ -6,6 +6,7 @@ const queryKeys = {
     product_page: ['product_page'],
     recentAction: ['recent-action'],
     settingsData: ['settings_data'],
+    subscriptions: ['subscriptions'],
     
     dashboard: ['dashboard'],
     topBar: ['top-bar'],
diff --git a/src/services/services.js b/src/services/services.js
index 644b4b3..ef4f2b9 100644
--- a/src/services/services.js
+++ b/src/services/services.js
@@ -166,6 +166,14 @@ export const getSettingsData = (reqData) => {
     return postAuxEnd(`/panel/myproduct/settings/values`, postData, false)
 }
 
+// FUNCTION TO GET PRODUCT SUBSCRIPTIONS
+export const getSubscriptions = (reqData) => {
+    let postData = {
+        ...reqData,
+    }
+    return postAuxEnd(`/panel/subscription/products`, postData, false)
+}
+