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 { ...@@ -3,7 +3,6 @@ import {
Box, Box,
Button, Button,
Flex, Flex,
Skeleton,
useDisclosure, useDisclosure,
type BoxProps, type BoxProps,
type ButtonProps type ButtonProps
...@@ -29,6 +28,7 @@ const EnterpriseAuthModal = dynamic(() => import('./Modal'), { ssr: false }); ...@@ -29,6 +28,7 @@ const EnterpriseAuthModal = dynamic(() => import('./Modal'), { ssr: false });
const EnterpriseAuthContactBusinessModal = dynamic(() => import('./ContactBusinessModal'), { const EnterpriseAuthContactBusinessModal = dynamic(() => import('./ContactBusinessModal'), {
ssr: false ssr: false
}); });
const EnterpriseAuthStatusRowHeight = '32px';
type EnterpriseAuthStatusRowProps = BoxProps & { type EnterpriseAuthStatusRowProps = BoxProps & {
labelStyles?: BoxProps; labelStyles?: BoxProps;
...@@ -246,14 +246,14 @@ const EnterpriseAuthStatusRow = ({ ...@@ -246,14 +246,14 @@ const EnterpriseAuthStatusRow = ({
if (!feConfigs?.show_enterprise_auth || data?.enabled === false) return null; if (!feConfigs?.show_enterprise_auth || data?.enabled === false) return null;
if (loading && !data) { if (loading && !data) {
return <Skeleton mt={4} h={'32px'} borderRadius={'8px'} {...props} />; return <Box mt={4} h={EnterpriseAuthStatusRowHeight} {...props} />;
} }
if (!data?.enabled) return null; if (!data?.enabled) return null;
return ( 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> <Box {...labelStyles}>{t('account_team:enterprise_auth_title')}&nbsp;</Box>
<Flex flex={'1 1 auto'} minW={0} align={'center'}> <Flex flex={'1 1 auto'} minW={0} align={'center'}>
<Box <Box
......
...@@ -63,9 +63,13 @@ const ConversionModal = dynamic(() => import('@/pageComponents/account/info/Conv ...@@ -63,9 +63,13 @@ const ConversionModal = dynamic(() => import('@/pageComponents/account/info/Conv
const UpdatePswModal = dynamic(() => import('@/pageComponents/account/info/UpdatePswModal')); const UpdatePswModal = dynamic(() => import('@/pageComponents/account/info/UpdatePswModal'));
const UpdateContact = dynamic(() => import('@/components/support/user/inform/UpdateContactModal')); const UpdateContact = dynamic(() => import('@/components/support/user/inform/UpdateContactModal'));
const CommunityModal = dynamic(() => import('@/components/CommunityModal')); const CommunityModal = dynamic(() => import('@/components/CommunityModal'));
const EnterpriseAuthStatusRowHeight = '32px';
const EnterpriseAuthStatusRow = dynamic( const EnterpriseAuthStatusRow = dynamic(
() => import('@/pageComponents/account/team/EnterpriseAuth'), () => import('@/pageComponents/account/team/EnterpriseAuth'),
{ ssr: false } {
ssr: false,
loading: () => <Box mt={4} h={EnterpriseAuthStatusRowHeight} />
}
); );
const ModelPriceModal = dynamic(() => const ModelPriceModal = dynamic(() =>
...@@ -401,15 +405,17 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => { ...@@ -401,15 +405,17 @@ const MyInfo = ({ onOpenContact }: { onOpenContact: () => void }) => {
</Box> </Box>
)} )}
<EnterpriseAuthStatusRow {showEnterpriseAuth && (
labelStyles={labelStyles} <EnterpriseAuthStatusRow
buttonProps={actionButtonStyles} labelStyles={labelStyles}
autoOpen={autoOpenEnterpriseAuth} buttonProps={actionButtonStyles}
onAutoOpenFinish={() => { autoOpen={autoOpenEnterpriseAuth}
clearCertificationHash(); onAutoOpenFinish={() => {
setAutoOpenEnterpriseAuth(false); clearCertificationHash();
}} setAutoOpenEnterpriseAuth(false);
/> }}
/>
)}
<MyDivider my={6} /> <MyDivider my={6} />
</Box> </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