Commit 69120fc8 by light5980 Committed by GitHub

fix(certification): remove initiative expire (#7288)

parent e11aa7a8
Subproject commit 63abbb63af6502569932de2a33ab6ed0eac2cd45
Subproject commit f104fb8433feea4719d3ec742bece0aa0b91b3d3
......@@ -3,7 +3,6 @@ import {
Box,
Button,
Flex,
Skeleton,
useDisclosure,
type BoxProps,
type ButtonProps
......@@ -29,6 +28,7 @@ const EnterpriseAuthModal = dynamic(() => import('./Modal'), { ssr: false });
const EnterpriseAuthContactBusinessModal = dynamic(() => import('./ContactBusinessModal'), {
ssr: false
});
const EnterpriseAuthStatusRowHeight = '32px';
type EnterpriseAuthStatusRowProps = BoxProps & {
labelStyles?: BoxProps;
......@@ -246,14 +246,14 @@ const EnterpriseAuthStatusRow = ({
if (!feConfigs?.show_enterprise_auth || data?.enabled === false) return null;
if (loading && !data) {
return <Skeleton mt={4} h={'32px'} borderRadius={'8px'} {...props} />;
return <Box mt={4} h={EnterpriseAuthStatusRowHeight} {...props} />;
}
if (!data?.enabled) return null;
return (
<>
<Flex mt={4} alignItems={'center'} minW={0} {...props}>
<Flex mt={4} h={EnterpriseAuthStatusRowHeight} alignItems={'center'} minW={0} {...props}>
<Box {...labelStyles}>{t('account_team:enterprise_auth_title')}&nbsp;</Box>
<Flex flex={'1 1 auto'} minW={0} align={'center'}>
<Box
......
......@@ -63,9 +63,13 @@ const ConversionModal = dynamic(() => import('@/pageComponents/account/info/Conv
const UpdatePswModal = dynamic(() => import('@/pageComponents/account/info/UpdatePswModal'));
const UpdateContact = dynamic(() => import('@/components/support/user/inform/UpdateContactModal'));
const CommunityModal = dynamic(() => import('@/components/CommunityModal'));
const EnterpriseAuthStatusRowHeight = '32px';
const EnterpriseAuthStatusRow = dynamic(
() => import('@/pageComponents/account/team/EnterpriseAuth'),
{ ssr: false }
{
ssr: false,
loading: () => <Box mt={4} h={EnterpriseAuthStatusRowHeight} />
}
);
const ModelPriceModal = dynamic(() =>
......@@ -401,15 +405,17 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => {
</Box>
)}
<EnterpriseAuthStatusRow
labelStyles={labelStyles}
buttonProps={actionButtonStyles}
autoOpen={autoOpenEnterpriseAuth}
onAutoOpenFinish={() => {
clearCertificationHash();
setAutoOpenEnterpriseAuth(false);
}}
/>
{showEnterpriseAuth && (
<EnterpriseAuthStatusRow
labelStyles={labelStyles}
buttonProps={actionButtonStyles}
autoOpen={autoOpenEnterpriseAuth}
onAutoOpenFinish={() => {
clearCertificationHash();
setAutoOpenEnterpriseAuth(false);
}}
/>
)}
<MyDivider my={6} />
</Box>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment