diff --git a/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx b/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx index 2fb1514e82..d5e67e046c 100644 --- a/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx +++ b/frontend/src/component/admin/billing/BillingDashboard/BillingPlan/BillingPlan.tsx @@ -162,16 +162,19 @@ export const BillingPlan: FC = ({ instanceStatus }) => { marginBottom: theme.spacing(1.5), })} > - + - {seats} team - members + Included members - {freeAssigned} assigned + {freeAssigned} of 5 assigned + + You have 5 team members included in + your PRO plan + @@ -183,7 +186,7 @@ export const BillingPlan: FC = ({ instanceStatus }) => { - Paid members + Paid members {paidAssigned} assigned @@ -191,9 +194,7 @@ export const BillingPlan: FC = ({ instanceStatus }) => { - Add up to 15 extra paid members - $ - {price.user} - /month per member + $15/month per paid member diff --git a/frontend/src/component/admin/billing/BillingHistory/BillingHistory.tsx b/frontend/src/component/admin/billing/BillingHistory/BillingHistory.tsx index 373f8cf4c6..6364975d41 100644 --- a/frontend/src/component/admin/billing/BillingHistory/BillingHistory.tsx +++ b/frontend/src/component/admin/billing/BillingHistory/BillingHistory.tsx @@ -37,9 +37,13 @@ const columns = [ disableGlobalFilter: true, }, { - Header: 'Due date', - accessor: 'dueDate', - Cell: DateCell, + Header: 'Created date', + accessor: 'created', + Cell: ({ value }: { value: number }) => { + return ( + + ); + }, sortType: 'date', disableGlobalFilter: true, }, @@ -69,7 +73,7 @@ export const BillingHistory: VFC = ({ }) => { const initialState = useMemo( () => ({ - sortBy: [{ id: 'dueDate' }], + sortBy: [{ id: 'created' }], }), [] );