ci(release): publish latest release

hello-happy-puppy · hello-happy-puppy · commit 340b8bf5286e · 2025-12-05T21:44:29.000Z
diff --git a/RELEASE b/RELEASE
@@ -1,6 +1,6 @@
 IPFS hash of the deployment:
-- CIDv0: `QmV3v7W3QtTJZ2jTWtFGRu9LKDRmkjAv6MUrGs3bHDH7C4`
-- CIDv1: `bafybeiddxbm7geeoogm4itkm237bqslkk672vnvbvqv4til5os2aknzide`
+- CIDv0: `QmW1GSntr72wmj3wkvVSTiUBuJhSAyYqbT2vByPh6F4pok`
+- CIDv1: `bafybeidr4zetpcfxiykgv54gfbgajwppixch3baghzdxvy5npks2tl76vm`
 
 The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
 
@@ -10,14 +10,14 @@ You can also access the Uniswap Interface from an IPFS gateway.
 Your Uniswap settings are never remembered across different URLs.
 
 IPFS gateways:
-- https://bafybeiddxbm7geeoogm4itkm237bqslkk672vnvbvqv4til5os2aknzide.ipfs.dweb.link/
-- [ipfs://QmV3v7W3QtTJZ2jTWtFGRu9LKDRmkjAv6MUrGs3bHDH7C4/](ipfs://QmV3v7W3QtTJZ2jTWtFGRu9LKDRmkjAv6MUrGs3bHDH7C4/)
+- https://bafybeidr4zetpcfxiykgv54gfbgajwppixch3baghzdxvy5npks2tl76vm.ipfs.dweb.link/
+- [ipfs://QmW1GSntr72wmj3wkvVSTiUBuJhSAyYqbT2vByPh6F4pok/](ipfs://QmW1GSntr72wmj3wkvVSTiUBuJhSAyYqbT2vByPh6F4pok/)
 
-### 5.120.7 (2025-12-05)
+### 5.120.8 (2025-12-05)
 
 
 ### Bug Fixes
 
-* **web:** tamagui Tooltip zIndex fix (#26107) 9f15cd0
+* **web:** tamagui Tooltip Adapt context  && increase Popover zIndexes (#26149) 5c2aa4f
 
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-web/5.120.7
+web/5.120.8
diff --git a/apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx b/apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx
@@ -190,7 +190,7 @@ function PersonalSignRequestContentLegacy({
             />
           </Tooltip.Trigger>
         </Flex>
-        <Tooltip.Content animationDirection="left" zIndex={zIndexes.tooltip}>
+        <Tooltip.Content animationDirection="left" zIndex={zIndexes.overlay}>
           <Tooltip.Arrow />
           <Text variant="body4">
             {viewEncoding === ViewEncoding.UTF8
diff --git a/apps/extension/src/app/features/onboarding/import/SelectWallets.tsx b/apps/extension/src/app/features/onboarding/import/SelectWallets.tsx
@@ -132,7 +132,7 @@ function SmartWalletTooltip(): JSX.Element | undefined {
           <Trans components={{ highlight: triggerComponent }} i18nKey="account.wallet.select.smartWalletDisclaimer" />
         </Text>
       </Flex>
-      <Tooltip.Content animationDirection="top" pointerEvents="auto" zIndex={zIndexes.tooltip}>
+      <Tooltip.Content animationDirection="top" pointerEvents="auto" zIndex={zIndexes.overlay}>
         <Tooltip.Arrow />
         <Flex>
           <Text variant="body4" color="$neutral2">
diff --git a/apps/web/src/components/AccountDrawer/DisconnectButton.tsx b/apps/web/src/components/AccountDrawer/DisconnectButton.tsx
@@ -100,7 +100,7 @@ function DisconnectMenuTooltip({ children }: PropsWithChildren) {
   return (
     <Tooltip placement="bottom-end">
       <Tooltip.Trigger>{children}</Tooltip.Trigger>
-      <Tooltip.Content pointerEvents="auto" paddingVertical={8} paddingHorizontal={8} zIndex={zIndexes.tooltip}>
+      <Tooltip.Content pointerEvents="auto" paddingVertical={8} paddingHorizontal={8} zIndex={zIndexes.overlay}>
         <DisconnectMenu />
       </Tooltip.Content>
     </Tooltip>
diff --git a/apps/web/src/components/Liquidity/LiquidityPositionInfoBadges.tsx b/apps/web/src/components/Liquidity/LiquidityPositionInfoBadges.tsx
@@ -153,7 +153,7 @@ export function LiquidityPositionInfoBadges({
         return (
           <Tooltip allowFlip stayInFrame placement="top" key={key}>
             <Tooltip.Trigger>{content}</Tooltip.Trigger>
-            <Tooltip.Content maxWidth="fit-content" zIndex={zIndexes.tooltip}>
+            <Tooltip.Content maxWidth="fit-content" zIndex={zIndexes.overlay}>
               <Tooltip.Arrow />
               <Text variant="body4" color="$neutral2">
                 {tooltipContent}
diff --git a/apps/web/src/components/NavBar/TestnetMode/TestnetModeTooltip.tsx b/apps/web/src/components/NavBar/TestnetMode/TestnetModeTooltip.tsx
@@ -29,7 +29,7 @@ export default function TestnetModeTooltip() {
           <Wrench color="$statusSuccess" size="$icon.16" />
         </Flex>
       </Tooltip.Trigger>
-      <Tooltip.Content animationDirection="right" zIndex={zIndexes.tooltip}>
+      <Tooltip.Content animationDirection="right" zIndex={zIndexes.overlay}>
         <Text variant="body4">{t('home.banner.testnetMode.nav')}</Text>
         <Tooltip.Arrow />
       </Tooltip.Content>
diff --git a/apps/web/src/components/NavBar/UniswapWrappedEntry.tsx b/apps/web/src/components/NavBar/UniswapWrappedEntry.tsx
@@ -61,7 +61,7 @@ export function UniswapWrappedEntry() {
               <Snowflake size="$icon.24" color="inherit" />
             </Text>
           </Tooltip.Trigger>
-          <Tooltip.Content zIndex={zIndexes.tooltip}>
+          <Tooltip.Content zIndex={zIndexes.overlay}>
             <Tooltip.Arrow />
             <Flex centered>
               <Text variant="buttonLabel4" color="$accent1">
diff --git a/apps/web/src/pages/Portfolio/Header/PortfolioAddressDisplay/DemoAddressDisplay.tsx b/apps/web/src/pages/Portfolio/Header/PortfolioAddressDisplay/DemoAddressDisplay.tsx
@@ -28,7 +28,7 @@ export function DemoAddressDisplay() {
             <Eye color="$neutral2" size="$icon.16" />
           </Flex>
         </Tooltip.Trigger>
-        <Tooltip.Content ml="$spacing8" zIndex={zIndexes.tooltip}>
+        <Tooltip.Content ml="$spacing8" zIndex={zIndexes.overlay}>
           <Text variant="body4">{t('portfolio.disconnected.demoWallet.description')}</Text>
         </Tooltip.Content>
       </Tooltip>
diff --git a/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx b/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
@@ -163,7 +163,7 @@ const AutocompleteRow = ({
                 <Tooltip.Trigger>
                   <Text variant="subheading2">{formattedAddress}</Text>
                 </Tooltip.Trigger>
-                <Tooltip.Content zIndex={zIndexes.tooltip} maxWidth="fit-content">
+                <Tooltip.Content zIndex={zIndexes.overlay} maxWidth="fit-content">
                   <Text variant="body4">{address}</Text>
                 </Tooltip.Content>
               </Tooltip>
@@ -179,7 +179,7 @@ const AutocompleteRow = ({
                   {formattedAddress}
                 </Text>
               </Tooltip.Trigger>
-              <Tooltip.Content zIndex={zIndexes.tooltip} maxWidth="fit-content">
+              <Tooltip.Content zIndex={zIndexes.overlay} maxWidth="fit-content">
                 <Text variant="body4">{address}</Text>
               </Tooltip.Content>
             </Tooltip>
@@ -381,7 +381,7 @@ export function SendRecipientForm({ disabled }: { disabled?: boolean }) {
           )}
         </Popover.Trigger>
         <Popover.Content
-          zIndex={zIndexes.popover}
+          zIndex={zIndexes.overlay}
           background="transparent"
           width={(inputNode.current?.clientWidth ?? 0) + 32}
           ref={popoverContentRef}
diff --git a/apps/web/src/pages/Swap/index.tsx b/apps/web/src/pages/Swap/index.tsx
@@ -393,7 +393,7 @@ const DisabledSwapOverlay = () => {
   return (
     <DisabledOverlay cursor="not-allowed">
       <Tooltip placement="left-start">
-        <Tooltip.Content animationDirection="left" zIndex={zIndexes.tooltip}>
+        <Tooltip.Content animationDirection="left" zIndex={zIndexes.overlay}>
           <Tooltip.Arrow />
           <Text variant="body4">{t('testnet.unsupported')}</Text>
         </Tooltip.Content>
diff --git a/bun.lock b/bun.lock
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -7,6 +7,7 @@
     "@shopify/flash-list": "1.7.6",
     "@shopify/react-native-skia": "2.2.4",
     "@storybook/react": "8.5.2",
+    "@tamagui/adapt": "1.136.1",
     "@tamagui/animations-react-native": "1.136.1",
     "@tamagui/font-inter": "1.136.1",
     "@tamagui/helpers-icon": "1.136.1",
diff --git a/packages/ui/src/components/tooltip/Tooltip.web.tsx b/packages/ui/src/components/tooltip/Tooltip.web.tsx
@@ -1,5 +1,8 @@
-import { styled, Tooltip as TamaguiTooltip, withStaticProperties } from 'tamagui'
+import { AdaptParent } from '@tamagui/adapt'
+import { useEffect, useId } from 'react'
+import { styled, Tooltip as TamaguiTooltip, useEvent, withStaticProperties } from 'tamagui'
 import { TooltipContentProps } from 'ui/src/components/tooltip/Tooltip'
+import { useBooleanState } from 'utilities/src/react/useBooleanState'
 
 export type { TooltipProps } from 'tamagui'
 
@@ -90,7 +93,40 @@ const TooltipRoot = styled(TamaguiTooltip, {
 
 TooltipRoot.displayName = 'TooltipRoot'
 
-export const Tooltip = withStaticProperties(TooltipRoot, {
+function TooltipBase(props: React.ComponentProps<typeof TamaguiTooltip>): JSX.Element {
+  const { open: openProp, onOpenChange, ...rest } = props
+
+  const isControlled = openProp !== undefined
+  const { value: isOpenInternal, setValue: setIsOpenInternal } = useBooleanState(openProp ?? false)
+
+  const currentOpen = isControlled ? openProp : isOpenInternal
+
+  // Generate a unique scope to isolate this tooltip from parent Adapt contexts (e.g., AdaptiveWebModal).
+  // Without this, when rendered inside a component using Adapt (like a bottom sheet modal),
+  // the tooltip content gets captured by the parent's Adapt and renders as sheet content instead of floating.
+  const tooltipAdaptScope = `TooltipIsolated${useId()}`
+
+  useEffect(() => {
+    if (isControlled) {
+      setIsOpenInternal(openProp)
+    }
+  }, [isControlled, setIsOpenInternal, openProp])
+
+  const handleOpenChange = useEvent((nextOpen: boolean) => {
+    if (!isControlled) {
+      setIsOpenInternal(nextOpen)
+    }
+    onOpenChange?.(nextOpen)
+  })
+
+  return (
+    <AdaptParent scope={tooltipAdaptScope}>
+      <TooltipRoot open={currentOpen} onOpenChange={handleOpenChange} {...rest} />
+    </AdaptParent>
+  )
+}
+
+export const Tooltip = withStaticProperties(TooltipBase, {
   Trigger: TamaguiTooltip.Trigger,
   Content,
   Arrow,
diff --git a/packages/uniswap/src/components/CurrencyInputPanel/DefaultTokenOptions/TokenOptions/TokenOptionItem/TokenOptionItem.web.tsx b/packages/uniswap/src/components/CurrencyInputPanel/DefaultTokenOptions/TokenOptions/TokenOptionItem/TokenOptionItem.web.tsx
@@ -26,7 +26,7 @@ export const TokenOptionItem = ({
           currencyField={currencyField}
         />
       </Tooltip.Trigger>
-      <Tooltip.Content zIndex={zIndexes.tooltip}>
+      <Tooltip.Content zIndex={zIndexes.overlay}>
         <Text variant="body4">{symbol}</Text>
         <Tooltip.Arrow />
       </Tooltip.Content>
diff --git a/packages/uniswap/src/components/RoutingDiagram/RoutingDiagram.tsx b/packages/uniswap/src/components/RoutingDiagram/RoutingDiagram.tsx
@@ -97,7 +97,7 @@ function HopBadge({ hop }: { hop: RoutingHop }): JSX.Element {
           <BadgeText>{badgeText}</BadgeText>
         </OpaqueBadge>
       </Tooltip.Trigger>
-      <Tooltip.Content zIndex={zIndexes.tooltip}>
+      <Tooltip.Content zIndex={zIndexes.overlay}>
         <Text variant="body4">{tooltipText}</Text>
         <Tooltip.Arrow />
       </Tooltip.Content>
diff --git a/packages/uniswap/src/components/TokenSelector/items/tokens/TokenCard.tsx b/packages/uniswap/src/components/TokenSelector/items/tokens/TokenCard.tsx
@@ -64,7 +64,7 @@ function _TokenCard({
     return (
       <Tooltip placement="bottom" offset={{ mainAxis: 4 }} delay={{ close: 0, open: 750 }}>
         <Tooltip.Trigger>{tokenCard}</Tooltip.Trigger>
-        <Tooltip.Content zIndex={zIndexes.tooltip}>
+        <Tooltip.Content zIndex={zIndexes.overlay}>
           <Text variant="body3" color="$neutral1">
             {chainLabel}
           </Text>
diff --git a/packages/uniswap/src/components/WarningMessage/WarningMessage.tsx b/packages/uniswap/src/components/WarningMessage/WarningMessage.tsx
@@ -22,7 +22,7 @@ export function WarningMessage({ warningMessage, color, tooltipText }: WarningMe
     return (
       <Tooltip>
         <Tooltip.Trigger>{warningContent}</Tooltip.Trigger>
-        <Tooltip.Content zIndex={zIndexes.tooltip}>
+        <Tooltip.Content zIndex={zIndexes.overlay}>
           <Text variant="body4">{tooltipText}</Text>
         </Tooltip.Content>
       </Tooltip>
diff --git a/packages/uniswap/src/components/tooltip/InfoTooltip.web.tsx b/packages/uniswap/src/components/tooltip/InfoTooltip.web.tsx
@@ -43,7 +43,7 @@ export function InfoTooltip({
         <Tooltip.Trigger>{trigger}</Tooltip.Trigger>
         {text && (
           <Tooltip.Content
-            zIndex={zIndexes.tooltip}
+            zIndex={zIndexes.overlay}
             pointerEvents="auto"
             maxWidth={maxWidth ?? (isWebPlatform ? 280 : '100%')}
             mx="$spacing24"
