Use isDualStackEnabled check instead of only flags.vpcIpv6 in several files

Author: DevDW

packages/manager/src/features/Linodes/LinodeEntityDetailBody.tsx

@@ -12,7 +12,7 @@ import { Link } from 'src/components/Link';
 import { useKubernetesBetaEndpoint } from 'src/features/Kubernetes/kubeUtils';
 import { AccessTable } from 'src/features/Linodes/AccessTable';
 import { ipTableId } from 'src/features/Linodes/LinodesDetail/LinodeNetworking/utils';
-import { useFlags } from 'src/hooks/useFlags';
+import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 import { useKubernetesClusterQuery } from 'src/queries/kubernetes';
 
 import { HighPerformanceVolumeIcon } from './HighPerformanceVolumeIcon';
@@ -102,8 +102,6 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
     vpcLinodeIsAssignedTo,
   } = props;
 
-  const flags = useFlags();
-
   const { data: profile } = useProfile();
 
   const { data: maskSensitiveDataPreference } = usePreferences(
@@ -116,6 +114,8 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
   const { isDiskEncryptionFeatureEnabled } =
     useIsDiskEncryptionFeatureEnabled();
 
+  const { isDualStackEnabled } = useVPCDualStack();
+
   const isLinodeInterface = interfaceGeneration === 'linode';
   const vpcIPv4 = getVPCIPv4(interfaceWithVPC);
   const vpcIPv6 = getVPCIPv6(interfaceWithVPC);
@@ -379,8 +379,8 @@ export const LinodeEntityDetailBody = React.memo((props: BodyProps) => {
                   </StyledIPItem>
                 </StyledIPBox>
               )}
-              {flags.vpcIpv6 &&
-                vpcIPv6 && ( // @TODO VPC IPv6: remove flag check once VPC IPv6 is fully rolled out
+              {isDualStackEnabled &&
+                vpcIPv6 && ( // @TODO VPC IPv6: remove Dual Stack check once VPC IPv6 is fully rolled out
                   <StyledIPBox>
                     <StyledIPLabel data-testid="vpc-ipv6-label">
                       VPC IPv6

packages/manager/src/features/VPCs/VPCDetail/SubnetLinodeRow.tsx

@@ -11,7 +11,7 @@ import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
 import { TableCell } from 'src/components/TableCell';
 import { TableRow } from 'src/components/TableRow';
 import { getLinodeIconStatus } from 'src/features/Linodes/LinodesLanding/utils';
-import { useFlags } from 'src/hooks/useFlags';
+import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 import { determineNoneSingleOrMultipleWithChip } from 'src/utilities/noneSingleOrMultipleWithChip';
 
 import { useInterfaceDataForLinode } from '../../../hooks/useInterfaceDataForLinode';
@@ -70,7 +70,7 @@ export const SubnetLinodeRow = (props: Props) => {
     subnetInterfaces,
   } = props;
 
-  const flags = useFlags();
+  const { isDualStackEnabled } = useVPCDualStack();
 
   const subnetInterfaceData =
     subnetInterfaces.find((interfaceData) => interfaceData.active) ??
@@ -231,7 +231,7 @@ export const SubnetLinodeRow = (props: Props) => {
           })}
         </TableCell>
       </Hidden>
-      {flags.vpcIpv6 && (
+      {isDualStackEnabled && (
         <>
           <Hidden smDown>
             <TableCell data-testid="vpc-ipv6-cell" noWrap>
@@ -403,7 +403,7 @@ const getIPRangesCellContents = (
 };
 
 export const SubnetLinodeTableRowHead = (
-  vpcIPv6FeatureFlag: boolean = false
+  isDualStackEnabled: boolean = false
 ) => (
   <TableRow>
     <TableCell sx={{ width: '24%' }}>Linode</TableCell>
@@ -414,7 +414,7 @@ export const SubnetLinodeTableRowHead = (
     <Hidden smDown>
       <TableCell>VPC IPv4 Ranges</TableCell>
     </Hidden>
-    {vpcIPv6FeatureFlag && (
+    {isDualStackEnabled && (
       <>
         <Hidden smDown>
           <TableCell>VPC IPv6</TableCell>

packages/manager/src/features/VPCs/VPCDetail/VPCSubnetsTable.tsx

@@ -28,9 +28,9 @@ import { TableSortCell } from 'src/components/TableSortCell';
 import { PowerActionsDialog } from 'src/features/Linodes/PowerActionsDialogOrDrawer';
 import { useIsNodebalancerVPCEnabled } from 'src/features/NodeBalancers/utils';
 import { SubnetActionMenu } from 'src/features/VPCs/VPCDetail/SubnetActionMenu';
-import { useFlags } from 'src/hooks/useFlags';
 import { useOrderV2 } from 'src/hooks/useOrderV2';
 import { usePaginationV2 } from 'src/hooks/usePaginationV2';
+import { useVPCDualStack } from 'src/hooks/useVPCDualStack';
 
 import { SUBNET_ACTION_PATH } from '../constants';
 import { VPC_DETAILS_ROUTE } from '../constants';
@@ -63,8 +63,6 @@ export const VPCSubnetsTable = (props: Props) => {
   const theme = useTheme();
   const { enqueueSnackbar } = useSnackbar();
 
-  const flags = useFlags();
-
   const navigate = useNavigate();
   const params = useParams({ strict: false });
   const location = useLocation();
@@ -90,6 +88,7 @@ export const VPCSubnetsTable = (props: Props) => {
   const { query } = search;
 
   const { isNodebalancerVPCEnabled } = useIsNodebalancerVPCEnabled();
+  const { isDualStackEnabled } = useVPCDualStack();
 
   const pagination = usePaginationV2({
     currentRoute: VPC_DETAILS_ROUTE,
@@ -295,9 +294,9 @@ export const VPCSubnetsTable = (props: Props) => {
         </TableSortCell>
       </Hidden>
       <TableCell sx={{ width: '18%' }}>
-        Subnet {flags.vpcIpv6 ? 'IPv4' : 'IP'} Range
+        Subnet {isDualStackEnabled ? 'IPv4' : 'IP'} Range
       </TableCell>
-      {flags.vpcIpv6 && <TableCell>Subnet IPv6 Range</TableCell>}
+      {isDualStackEnabled && <TableCell>Subnet IPv6 Range</TableCell>}
       <Hidden smDown>
         <TableCell
           sx={{ width: '10%' }}
@@ -315,7 +314,7 @@ export const VPCSubnetsTable = (props: Props) => {
             <TableCell>{subnet.id}</TableCell>
           </Hidden>
           <TableCell>{subnet.ipv4}</TableCell>
-          {flags.vpcIpv6 && (
+          {isDualStackEnabled && (
             <TableCell>{subnet.ipv6?.[0]?.range ?? '—'}</TableCell>
           )}
           <Hidden smDown>
@@ -346,7 +345,7 @@ export const VPCSubnetsTable = (props: Props) => {
                 color: theme.tokens.color.Neutrals.White,
               }}
             >
-              {SubnetLinodeTableRowHead(flags.vpcIpv6)}
+              {SubnetLinodeTableRowHead(isDualStackEnabled)}
             </TableHead>
             <TableBody>
               {subnet.linodes.length > 0 ? (
@@ -364,7 +363,7 @@ export const VPCSubnetsTable = (props: Props) => {
                 ))
               ) : (
                 <TableRowEmpty
-                  colSpan={flags.vpcIpv6 ? 8 : 6}
+                  colSpan={isDualStackEnabled ? 8 : 6}
                   message="No Linodes"
                 />
               )}