diff --git a/app/client/package.json b/app/client/package.json
index 6cdeb73745..27e21ea049 100644
--- a/app/client/package.json
+++ b/app/client/package.json
@@ -49,7 +49,7 @@
"cypress-log-to-output": "^1.1.2",
"dayjs": "^1.10.6",
"deep-diff": "^1.0.2",
- "design-system-old": "npm:@appsmithorg/design-system-old@1.0.48",
+ "design-system-old": "npm:@appsmithorg/design-system-old@1.0.50",
"downloadjs": "^1.4.7",
"draft-js": "^0.11.7",
"exceljs": "^4.3.0",
diff --git a/app/client/src/assets/svg/be-upgrade/be-cta.svg b/app/client/src/assets/svg/be-upgrade/be-cta.svg
deleted file mode 100644
index 85908c17f5..0000000000
--- a/app/client/src/assets/svg/be-upgrade/be-cta.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-
diff --git a/app/client/src/assets/svg/be-upgrade/upgrade-to-be-text.svg b/app/client/src/assets/svg/be-upgrade/upgrade-to-be-text.svg
deleted file mode 100644
index 3ce1bfe399..0000000000
--- a/app/client/src/assets/svg/be-upgrade/upgrade-to-be-text.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-
diff --git a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx
index b77b3f4fcb..285772a235 100644
--- a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx
+++ b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx
@@ -193,7 +193,7 @@ export default function LeftPane() {
to="/settings/business-edition"
>
-
+
{camelCase(createMessage(UPGRADE))}
diff --git a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
index 455bc52d4b..67b9a9e5d3 100644
--- a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
+++ b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx
@@ -1,7 +1,5 @@
import React from "react";
import styled from "styled-components";
-import BETextImage from "assets/svg/be-upgrade/upgrade-to-be-text.svg";
-import BECtaImage from "assets/svg/be-upgrade/be-cta.svg";
import {
createMessage,
MOVE_TO_BUSINESS_EDITION,
@@ -9,6 +7,7 @@ import {
import { FooterComponent } from "../Footer";
import useOnUpgrade from "utils/hooks/useOnUpgrade";
import { Colors } from "constants/Colors";
+import { ASSETS_CDN_URL } from "constants/ThirdPartyConstants";
export const UpgradeToBEPageWrapper = styled.div`
width: 100%;
@@ -19,10 +18,10 @@ export const UpgradeToBEPageWrapper = styled.div`
`;
export const ImageContainer = styled.div`
- min-width: 400px;
img {
- width: 600px;
- height: 600px;
+ width: 500px;
+ height: 500px;
+ min-width: 400px;
}
`;
@@ -33,6 +32,9 @@ export const FooterContainer = styled.div`
margin-left: 256px;
height: 90px;
z-index: 2;
+ .left {
+ min-width: 100px;
+ }
}
`;
@@ -50,29 +52,26 @@ export const Overlay = styled.div`
export const FlexContainer = styled.div`
display: flex;
align-items: center;
- height: calc(100% - 96px);
width: 100%;
+ height: calc(100% - 96px);
justify-content: center;
- min-width: 1200px;
`;
export const LeftWrapper = styled.div`
- min-width: 700px;
img {
- width: 1000px;
- height: 1000px;
+ min-width: 500px;
+ width: 600px;
+ height: 600px;
}
`;
export const ContentWrapper = styled.div`
display: flex;
height: 100%;
- width: 1000px;
flex-direction: row;
- padding: 48px 200px;
align-items: center;
justify-content: center;
- min-width: 900px;
+ overflow: hidden;
`;
export const UpgradeToBEPage = () => {
@@ -87,10 +86,16 @@ export const UpgradeToBEPage = () => {
- 
+ 
- 
+ 
diff --git a/app/client/src/ce/reducers/tenantReducer.ts b/app/client/src/ce/reducers/tenantReducer.ts
index fe9d6e1f70..9545b9c949 100644
--- a/app/client/src/ce/reducers/tenantReducer.ts
+++ b/app/client/src/ce/reducers/tenantReducer.ts
@@ -16,6 +16,7 @@ export interface TenantReduxState {
tenantConfiguration: Record;
new: boolean;
isLoading: boolean;
+ instanceId: string;
}
export const defaultBrandingConfig = {
@@ -33,6 +34,7 @@ export const initialState: TenantReduxState = {
},
new: false,
isLoading: true,
+ instanceId: "",
};
export const handlers = {
@@ -54,6 +56,7 @@ export const handlers = {
...action.payload.tenantConfiguration,
},
isLoading: false,
+ instanceId: action.payload.instanceId,
}),
[ReduxActionErrorTypes.FETCH_CURRENT_TENANT_CONFIG_ERROR]: (
state: TenantReduxState,
diff --git a/app/client/src/ce/selectors/tenantSelectors.tsx b/app/client/src/ce/selectors/tenantSelectors.tsx
index 5c8e603736..0fe3f8f920 100644
--- a/app/client/src/ce/selectors/tenantSelectors.tsx
+++ b/app/client/src/ce/selectors/tenantSelectors.tsx
@@ -33,3 +33,6 @@ export const isTenantLoading = (state: AppState) => {
export const getGoogleMapsApiKey = (state: AppState): string | undefined =>
state.tenant?.tenantConfiguration?.googleMapsKey as string | undefined;
+
+export const getInstanceId = (state: AppState): string =>
+ state.tenant?.instanceId;
diff --git a/app/client/src/utils/hooks/useOnUpgrade.ts b/app/client/src/utils/hooks/useOnUpgrade.ts
index 623231acd0..ee8c7ae838 100644
--- a/app/client/src/utils/hooks/useOnUpgrade.ts
+++ b/app/client/src/utils/hooks/useOnUpgrade.ts
@@ -3,7 +3,7 @@ import {
createMessage,
UPGRADE_TO_EE_GENERIC,
} from "@appsmith/constants/messages";
-import { getTenantConfig } from "@appsmith/selectors/tenantSelectors";
+import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
import { useSelector } from "react-redux";
import { selectFeatureFlags } from "selectors/usersSelectors";
import AnalyticsUtil, { EventName } from "utils/AnalyticsUtil";
@@ -19,7 +19,7 @@ type Props = {
const useOnUpgrade = (props: Props) => {
const { intercomMessage, logEventData, logEventName } = props;
const features = useSelector(selectFeatureFlags);
- const tenantConfig = useSelector(getTenantConfig);
+ const instanceId = useSelector(getInstanceId);
const triggerIntercom = (message: string) => {
if (intercomAppID && window.Intercom) {
@@ -34,7 +34,7 @@ const useOnUpgrade = (props: Props) => {
);
if (features.USAGE_AND_BILLING) {
window.open(
- `https://www.appsmith.com/api/preview?secret=8JPsJRnSkt6Va8FzxUPFhZezxZuHRnSU&slug=pricing-preview?source=CE&instance=${tenantConfig?.instanceId}`,
+ `https://www.appsmith.com/api/preview?secret=8JPsJRnSkt6Va8FzxUPFhZezxZuHRnSU&slug=pricing-preview?source=CE&instance=${instanceId}`,
"_blank",
);
} else {
diff --git a/app/client/yarn.lock b/app/client/yarn.lock
index 3bab54d032..ee1b96c1cb 100644
--- a/app/client/yarn.lock
+++ b/app/client/yarn.lock
@@ -6249,10 +6249,10 @@ depd@~1.1.2:
version "1.1.2"
resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
-"design-system-old@npm:@appsmithorg/design-system-old@1.0.48":
- version "1.0.48"
- resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.0.48.tgz#69c1a1421486af8be52cbad4d3d7c261ba206ed2"
- integrity sha512-W03JOzbyhDIEdT0KGnXJh36xrve2/bLi/cGJxpWVSfvYgxWjEFITFszpAt8MORg9JF4rD9DKMrvUEG/dnTzyLg==
+"design-system-old@npm:@appsmithorg/design-system-old@1.0.50":
+ version "1.0.50"
+ resolved "https://registry.yarnpkg.com/@appsmithorg/design-system-old/-/design-system-old-1.0.50.tgz#5d41257c71bf0ba8620858bec9a79b70090c9857"
+ integrity sha512-0SgeKURwh7XvMmeYv3Yz3ldCgjuBW6yD1hnXc/9Pndm1Rtcth34jjvsqtUfZmh1Dvs7xhbtOtCAxfHEPKZ4wQg==
dependencies:
emoji-mart "3.0.1"