Revert "chore: adapt billing page to custom billing scenarios"

This reverts commit 13fbcec.
Unleash · Nov 26, 2024 · ff164a0 · ff164a0
1 parent 13fbcec
commit ff164a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/...nd/src/component/admin/billing/BillingDashboard/BillingInformation/BillingInformation.tsx b/...nd/src/component/admin/billing/BillingDashboard/BillingInformation/BillingInformation.tsx
@@ -46,40 +46,26 @@ export const BillingInformation = () => {
 
     const plan = `${instanceStatus.plan}${isPAYG ? ' Pay-as-You-Go' : ''}`;
     const inactive = instanceStatus.state !== InstanceState.ACTIVE;
-    const { isCustomBilling } = instanceStatus;
 
     return (
         <Grid item xs={12} md={5}>
             <StyledInfoBox>
                 <StyledTitle variant='body1'>Billing information</StyledTitle>
                 <ConditionallyRender
-                    condition={Boolean(isCustomBilling)}
+                    condition={inactive}
                     show={
-                        <StyledInfoLabel>
-                            Your billing is managed by Unleash
-                        </StyledInfoLabel>
-                    }
-                    elseShow={
-                        <>
-                            <ConditionallyRender
-                                condition={inactive}
-                                show={
-                                    <StyledAlert severity='warning'>
-                                        In order to{' '}
-                                        <strong>Upgrade trial</strong> you need
-                                        to provide us your billing information.
-                                    </StyledAlert>
-                                }
-                            />
-                            <BillingInformationButton update={!inactive} />
-                            <StyledInfoLabel>
-                                {inactive
-                                    ? 'Once we have received your billing information we will upgrade your trial within 1 business day'
-                                    : 'Update your credit card and business information and change which email address we send invoices to'}
-                            </StyledInfoLabel>
-                        </>
+                        <StyledAlert severity='warning'>
+                            In order to <strong>Upgrade trial</strong> you need
+                            to provide us your billing information.
+                        </StyledAlert>
                     }
                 />
+                <BillingInformationButton update={!inactive} />
+                <StyledInfoLabel>
+                    {inactive
+                        ? 'Once we have received your billing information we will upgrade your trial within 1 business day'
+                        : 'Update your credit card and business information and change which email address we send invoices to'}
+                </StyledInfoLabel>
                 <StyledDivider />
                 <StyledInfoLabel>
                     <a

diff --git a/frontend/src/interfaces/instance.ts b/frontend/src/interfaces/instance.ts
@@ -7,7 +7,6 @@ export interface IInstanceStatus {
     state?: InstanceState;
     seats?: number;
     minSeats?: number;
-    isCustomBilling?: boolean;
 }
 
 export enum InstanceState {