Merge branch 'Uniswap:main' into main

Author: Dargon789

CODEOWNERS

@@ -0,0 +1 @@
+* @uniswap/web-admins

RELEASE

@@ -1,5 +1,18 @@
-We are back with some small updates! Here’s the latest:
+IPFS hash of the deployment:
+- CIDv0: `QmbENTNezCQwTKQ2VkX1SqyZZPRrduUGjfXvek11DL4yn3`
+- CIDv1: `bafybeif7rqirjplagadkzstmg5kpcsusw3urflnjglb2wuqtunyune3fhq`
+
+The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
+
+You can also access the Uniswap Interface from an IPFS gateway.
+**BEWARE**: The Uniswap interface uses [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported.
+**You should always use an IPFS gateway that enforces origin separation**, or our hosted deployment of the latest release at [app.uniswap.org](https://app.uniswap.org).
+Your Uniswap settings are never remembered across different URLs.
+
+IPFS gateways:
+- https://bafybeif7rqirjplagadkzstmg5kpcsusw3urflnjglb2wuqtunyune3fhq.ipfs.dweb.link/
+- [ipfs://QmbENTNezCQwTKQ2VkX1SqyZZPRrduUGjfXvek11DL4yn3/](ipfs://QmbENTNezCQwTKQ2VkX1SqyZZPRrduUGjfXvek11DL4yn3/)
+
+### 5.69.4 (2025-02-07)
+
 
-- More robust dapp information on Activity screen
-- Improved volume-based sorting on our Explore page
-- Various bug fixes and performance improvements

VERSION

@@ -1 +1 @@
-extension/1.14.0
+web/5.69.4

apps/extension/package.json

@@ -12,11 +12,11 @@
     "@svgr/webpack": "8.0.1",
     "@tamagui/core": "1.114.4",
     "@types/uuid": "9.0.1",
-    "@uniswap/analytics-events": "2.40.0",
+    "@uniswap/analytics-events": "2.41.0",
     "@uniswap/uniswapx-sdk": "3.0.0-beta.1",
-    "@uniswap/universal-router-sdk": "4.10.0",
-    "@uniswap/v3-sdk": "3.21.0",
-    "@uniswap/v4-sdk": "1.15.0",
+    "@uniswap/universal-router-sdk": "4.14.0",
+    "@uniswap/v3-sdk": "3.24.0",
+    "@uniswap/v4-sdk": "1.18.0",
     "dotenv-webpack": "8.0.1",
     "ethers": "5.7.2",
     "eventemitter3": "5.0.1",

apps/extension/src/app/PopupApp.tsx

@@ -63,7 +63,7 @@ function PopupContent(): JSX.Element {
               backgroundColor="$surface1"
               borderColor="$surface3"
               borderRadius={6}
-              borderWidth={1}
+              borderWidth="$spacing1"
               bottom={-spacing.spacing4}
               p="$spacing2"
               position="absolute"

apps/extension/src/app/SidebarApp.tsx

@@ -1,6 +1,7 @@
 import '@tamagui/core/reset.css'
 import 'src/app/Global.css'
 
+import { SharedEventName } from '@uniswap/analytics-events'
 import { useEffect, useRef, useState } from 'react'
 import { I18nextProvider } from 'react-i18next'
 import { useDispatch } from 'react-redux'
@@ -236,10 +237,11 @@ export default function SidebarApp(): JSX.Element {
   }, [])
 
   const isLoggedIn = useIsWalletUnlocked()
-  const hasSentLoginEvent = useRef(false)
+  const hasSentAppLoadEvent = useRef(false)
   useEffect(() => {
-    if (isLoggedIn !== null && !hasSentLoginEvent.current) {
-      hasSentLoginEvent.current = true
+    if (isLoggedIn !== null && !hasSentAppLoadEvent.current) {
+      hasSentAppLoadEvent.current = true
+      sendAnalyticsEvent(SharedEventName.APP_LOADED)
       sendAnalyticsEvent(ExtensionEventName.SidebarLoad, { locked: !isLoggedIn })
     }
   }, [isLoggedIn])

apps/extension/src/app/components/Input.tsx

@@ -21,7 +21,7 @@ export const Input = forwardRef<Input, InputProps>(function _Input(
       backgroundColor={large ? '$surface1' : '$surface2'}
       borderColor="$surface3"
       borderRadius="$rounded16"
-      borderWidth={1}
+      borderWidth="$spacing1"
       focusStyle={inputStyles.inputFocus}
       fontSize={fonts.subheading2.fontSize}
       height="auto"

apps/extension/src/app/components/MnemonicViewer.tsx

@@ -51,7 +51,7 @@ export const MnemonicViewer = ({ mnemonic }: { mnemonic?: string[] }): JSX.Eleme
       backgroundColor="$surface2"
       borderColor="$surface3"
       borderRadius="$rounded20"
-      borderWidth={1}
+      borderWidth="$spacing1"
       gap="$spacing12"
       position="relative"
       px={px}

apps/extension/src/app/components/loading/SelectWalletSkeleton.tsx

@@ -19,7 +19,7 @@ function WalletSkeleton({ opacity }: { opacity: number }): JSX.Element {
       alignItems="center"
       borderColor="$surface3"
       borderRadius="$rounded20"
-      borderWidth={1}
+      borderWidth="$spacing1"
       height={WALLET_PREVIEW_CARD_HEIGHT}
       justifyContent="flex-start"
       opacity={opacity}

apps/extension/src/app/components/tabs/ActivityTab.tsx

@@ -1,6 +1,6 @@
 import { memo } from 'react'
 import { ScrollView } from 'ui/src'
-import { useActivityData } from 'wallet/src/features/activity/useActivityData'
+import { useActivityData } from 'wallet/src/features/activity/hooks/useActivityData'
 
 export const ActivityTab = memo(function _ActivityTab({ address }: { address: Address }): JSX.Element {
   const { maybeEmptyComponent, renderActivityItem, sectionData } = useActivityData({