Refactor code to include SkyUpgrade feature flag

components/portfolio/positions/PortfolioPositionBlock.tsx

@@ -54,7 +54,11 @@ const getMigrationGradientsPerProtocol = (
 
 export const PortfolioPositionBlock = ({ position }: { position: PortfolioPosition }) => {
   const { t: tPortfolio } = useTranslation('portfolio')
-  const { EnableRefinance: isRefinanceEnabled, Rays: isRaysEnabled } = useAppConfig('features')
+  const {
+    EnableRefinance: isRefinanceEnabled,
+    Rays: isRaysEnabled,
+    SkyUpgrade,
+  } = useAppConfig('features')
 
   const resolvedPairId = shouldShowPairId({
     collateralToken: position.primaryToken,
@@ -87,9 +91,10 @@ export const PortfolioPositionBlock = ({ position }: { position: PortfolioPositi
     : {}
 
   const showSkyBanner =
-    position.protocol === LendingProtocol.Maker ||
-    [position.primaryToken, position.secondaryToken].includes('DAI') ||
-    [position.primaryToken, position.secondaryToken].includes('MKR')
+    SkyUpgrade &&
+    (position.protocol === LendingProtocol.Maker ||
+      [position.primaryToken, position.secondaryToken].includes('DAI') ||
+      [position.primaryToken, position.secondaryToken].includes('MKR'))
 
   return (
     <>

components/vault/GeneralManageLayout.tsx

@@ -9,6 +9,7 @@ import { VaultNoticesView } from 'features/notices/VaultsNoticesView'
 import { vaultTypeToSDKType } from 'features/refinance/helpers/vaultTypeToSDKType'
 import { useMakerRefinanceContextInputs } from 'features/refinance/hooks'
 import { UpgradeToSkyBanner } from 'features/sky/components/UpgradeToSkyBanner'
+import { useAppConfig } from 'helpers/config'
 import { useTranslation } from 'next-i18next'
 import React from 'react'
 import { Box, Card, Grid } from 'theme-ui'
@@ -23,6 +24,7 @@ interface GeneralManageLayoutProps {
 
 export function GeneralManageLayout({ generalManageVault, chainId }: GeneralManageLayoutProps) {
   const { t } = useTranslation()
+  const { SkyUpgrade } = useAppConfig('features')
   const { ilkData, vault, priceInfo, account } = generalManageVault.state
   const colRatioPercnentage = vault.collateralizationRatio.times(100).toFixed(2)
 
@@ -75,7 +77,7 @@ export function GeneralManageLayout({ generalManageVault, chainId }: GeneralMana
 
   return (
     <Grid gap={0} sx={{ width: '100%' }}>
-      {isOwner && <UpgradeToSkyBanner />}
+      {isOwner && SkyUpgrade && <UpgradeToSkyBanner />}
       <VaultNoticesView id={vault.id} />
       <Box sx={{ zIndex: 2, mt: 4 }}>{headlineElement}</Box>
       <GeneralManageTabBar

features/dsr/containers/DsrView.tsx

@@ -13,6 +13,7 @@ import { handleAmountChange } from 'features/dsr/utils/formUtils'
 import { selectPrimaryAction } from 'features/dsr/utils/helpers'
 import { VaultOwnershipBanner } from 'features/notices/VaultsNoticesView'
 import { UpgradeToSkyBanner } from 'features/sky/components/UpgradeToSkyBanner'
+import { useAppConfig } from 'helpers/config'
 import { formatCryptoBalance, formatPercent } from 'helpers/formatters/format'
 import type { Loadable } from 'helpers/loadable'
 import { zero } from 'helpers/zero'
@@ -55,6 +56,7 @@ export function DsrView({
   daiPrice,
 }: DsrViewProps) {
   const { t } = useTranslation()
+  const { SkyUpgrade } = useAppConfig('features')
   const isLoading = isLoadingCollection.includes(dsrDepositState.stage)
 
   const account = context.status === 'connected' ? context.account : undefined
@@ -70,7 +72,7 @@ export function DsrView({
           <VaultOwnershipBanner account={account} controller={walletAddress} />
         </Box>
       )}
-      {isOwner && <UpgradeToSkyBanner />}
+      {isOwner && SkyUpgrade && <UpgradeToSkyBanner />}
       <VaultHeadline
         header={t('dsr.titles.heading')}
         tokens={['DAI']}

features/omni-kit/controllers/OmniLayoutController.tsx

@@ -35,7 +35,7 @@ import React from 'react'
 import { Box, Container, Grid } from 'theme-ui'
 
 export function OmniLayoutController({ txHandler }: { txHandler: () => () => void }) {
-  const { ProxyReveal: proxyReveal, LambdaAutomations } = useAppConfig('features')
+  const { ProxyReveal: proxyReveal, LambdaAutomations, SkyUpgrade } = useAppConfig('features')
 
   const { t } = useTranslation()
 
@@ -107,7 +107,8 @@ export function OmniLayoutController({ txHandler }: { txHandler: () => () => voi
       : false
 
   const showSkyBanner =
-    [quoteToken, collateralToken].includes('DAI') || [quoteToken, collateralToken].includes('MKR')
+    SkyUpgrade &&
+    ([quoteToken, collateralToken].includes('DAI') || [quoteToken, collateralToken].includes('MKR'))
 
   return (
     <Container variant="vaultPageContainerStatic">