Merge branch 'Uniswap:main' into main

Author: gabririgo

.gitignore

@@ -42,7 +42,6 @@ dist/out-tsc/*
 
 # Locale backup/generated files
 packages/uniswap/src/i18n/locales/source/*_old.json
-packages/uniswap/src/i18n/locales/@types/resources.d.ts
 
 # ci
 .ci-cache/

RELEASE

@@ -1,15 +1,21 @@
-### We’re back with an exciting release! Here’s the latest
-
-### Unichain Testnet Support
-
-Unichain is a new DeFi-native Ethereum L2, built to be the home for liquidity across chains. We now support its testnet, **Unichain Sepolia**!
-
-### Testnet Mode
-
-Now, developers can use the Uniswap Wallet to transact on testnets and store testnet assets. Currently, we support **ETH Sepolia** and **Unichain Sepolia**.
-
-### Other Changes
-
-- Improved visuals around the networks we support
-- Better linkouts on transaction details sheet
-- Various bug fixes and performance improvements
+### Lots of new updates! 
+
+ ### Bridging
+ 
+ You can now swap your ETH, USDC, and more across 8+ networks! Try it by pressing the banner on your homepage.  
+
+### Claim usernames
+
+You can now claim a free uni.eth for your wallet address, a readable username that makess it easy to identify your wallet and receive crypto. 
+
+### Multichain Explore
+
+Users can now see all 12 chains we support on the Explore page, and can also filter by a specific chain. 
+
+### Worldchain
+
+Users now have access to all ur regular features for this new chain.
+
+### Other changes: 
+
+- Various bug fixes and performance improvements

VERSION

@@ -1 +1 @@
-extension/1.7.0
+extension/1.8.0

apps/extension/.eslintrc.js

@@ -12,7 +12,7 @@ module.exports = {
     'manifest.json',
   ],
   parserOptions: {
-    project: 'tsconfig.json',
+    project: 'tsconfig.eslint.json',
     tsconfigRootDir: __dirname,
     ecmaFeatures: {
       jsx: true,

apps/extension/package.json

@@ -4,6 +4,7 @@
   "browserslist": "last 2 chrome versions",
   "dependencies": {
     "@apollo/client": "3.10.4",
+    "@datadog/browser-rum": "5.23.3",
     "@ethersproject/providers": "5.7.2",
     "@metamask/rpc-errors": "6.2.1",
     "@reduxjs/toolkit": "1.9.3",
@@ -13,11 +14,11 @@
     "@svgr/webpack": "8.0.1",
     "@tamagui/core": "1.108.4",
     "@types/uuid": "9.0.1",
-    "@uniswap/analytics-events": "2.37.0",
+    "@uniswap/analytics-events": "2.38.0",
     "@uniswap/uniswapx-sdk": "^2.1.0-beta.14",
-    "@uniswap/universal-router-sdk": "4.2.0",
-    "@uniswap/v3-sdk": "3.17.0",
-    "@uniswap/v4-sdk": "1.10.0",
+    "@uniswap/universal-router-sdk": "4.5.2",
+    "@uniswap/v3-sdk": "3.18.1",
+    "@uniswap/v4-sdk": "1.10.3",
     "dotenv-webpack": "8.0.1",
     "ethers": "5.7.2",
     "eventemitter3": "5.0.1",

apps/extension/src/app/OnboardingApp.tsx

@@ -34,7 +34,7 @@ import { ScanToOnboard } from 'src/app/features/onboarding/scan/ScanToOnboard'
 import { ScantasticContextProvider } from 'src/app/features/onboarding/scan/ScantasticContextProvider'
 import { OnboardingRoutes, TopLevelRoutes } from 'src/app/navigation/constants'
 import { setRouter, setRouterState } from 'src/app/navigation/state'
-import { sentryCreateHashRouter } from 'src/app/sentry'
+import { SentryAppNameTag, sentryCreateHashRouter } from 'src/app/sentry'
 import { initExtensionAnalytics } from 'src/app/utils/analytics'
 import { checksIfSupportsSidePanel } from 'src/app/utils/chrome'
 import { PrimaryAppInstanceDebuggerLazy } from 'src/store/PrimaryAppInstanceDebuggerLazy'
@@ -56,14 +56,6 @@ const unsupportedRoute: RouteObject = {
   element: <UnsupportedBrowserScreen />,
 }
 
-const createSteps = {
-  [CreateOnboardingSteps.Password]: <PasswordCreate />,
-  [CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
-  [CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
-  [CreateOnboardingSteps.Naming]: <NameWallet />,
-  [CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
-}
-
 const allRoutes = [
   {
     path: '',
@@ -75,7 +67,18 @@ const allRoutes = [
   },
   {
     path: OnboardingRoutes.Create,
-    element: <OnboardingStepsProvider key={OnboardingRoutes.Create} steps={createSteps} />,
+    element: (
+      <OnboardingStepsProvider
+        key={OnboardingRoutes.Create}
+        steps={{
+          [CreateOnboardingSteps.Password]: <PasswordCreate />,
+          [CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
+          [CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
+          [CreateOnboardingSteps.Naming]: <NameWallet />,
+          [CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
+        }}
+      />
+    ),
   },
   {
     path: OnboardingRoutes.Claim,
@@ -84,7 +87,10 @@ const allRoutes = [
         key={OnboardingRoutes.Claim}
         steps={{
           [CreateOnboardingSteps.ClaimUnitag]: <ClaimUnitagScreen />,
-          ...createSteps,
+          [CreateOnboardingSteps.Password]: <PasswordCreate />,
+          [CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
+          [CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
+          [CreateOnboardingSteps.Complete]: <Complete tryToClaimUnitag flow={ExtensionOnboardingFlow.New} />,
         }}
       />
     ),
@@ -181,7 +187,7 @@ export default function OnboardingApp(): JSX.Element {
   return (
     <Trace>
       <PersistGate persistor={getReduxPersistor()}>
-        <ExtensionStatsigProvider>
+        <ExtensionStatsigProvider appName={SentryAppNameTag.Onboarding}>
           <I18nextProvider i18n={i18n}>
             <SharedWalletProvider reduxStore={getReduxStore()}>
               <ErrorBoundary>

apps/extension/src/app/PopupApp.tsx

@@ -13,7 +13,6 @@ import { TraceUserProperties } from 'src/app/components/Trace/TraceUserPropertie
 import { DappContextProvider } from 'src/app/features/dapp/DappContext'
 import { SentryAppNameTag, initializeSentry, sentryCreateHashRouter } from 'src/app/sentry'
 import { initExtensionAnalytics } from 'src/app/utils/analytics'
-import { getLocalUserId } from 'src/app/utils/storage'
 import { getReduxPersistor, getReduxStore } from 'src/store/store'
 import { Button, Flex, Image, Text } from 'ui/src'
 import { CHROME_LOGO, UNISWAP_LOGO } from 'ui/src/assets'
@@ -25,18 +24,19 @@ import { ElementName } from 'uniswap/src/features/telemetry/constants'
 import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
 import i18n from 'uniswap/src/i18n/i18n'
 import { ExtensionScreens } from 'uniswap/src/types/screens/extension'
+import { getUniqueId } from 'utilities/src/device/getUniqueId'
 import { logger } from 'utilities/src/logger/logger'
 import { ErrorBoundary } from 'wallet/src/components/ErrorBoundary/ErrorBoundary'
 import { useTestnetModeForLoggingAndAnalytics } from 'wallet/src/features/testnetMode/hooks'
 import { SharedWalletProvider } from 'wallet/src/providers/SharedWalletProvider'
 
-getLocalUserId()
+getUniqueId()
   .then((userId) => {
     initializeSentry(SentryAppNameTag.Popup, userId)
   })
   .catch((error) => {
     logger.error(error, {
-      tags: { file: 'PopupApp.tsx', function: 'getLocalUserId' },
+      tags: { file: 'PopupApp.tsx', function: 'getUniqueId' },
     })
   })
 
@@ -127,7 +127,7 @@ export default function PopupApp(): JSX.Element {
   return (
     <Trace>
       <PersistGate persistor={getReduxPersistor()}>
-        <ExtensionStatsigProvider>
+        <ExtensionStatsigProvider appName={SentryAppNameTag.Popup}>
           <I18nextProvider i18n={i18n}>
             <SharedWalletProvider reduxStore={getReduxStore()}>
               <ErrorBoundary>

apps/extension/src/app/SidebarApp.tsx

@@ -31,9 +31,9 @@ import { MainContent, WebNavigation } from 'src/app/navigation/navigation'
 import { setRouter, setRouterState } from 'src/app/navigation/state'
 import { SentryAppNameTag, initializeSentry, sentryCreateHashRouter } from 'src/app/sentry'
 import { initExtensionAnalytics } from 'src/app/utils/analytics'
-import { getLocalUserId } from 'src/app/utils/storage'
 import {
   DappBackgroundPortChannel,
+  backgroundToSidePanelMessageChannel,
   createBackgroundToSidePanelMessagePort,
 } from 'src/background/messagePassing/messageChannels'
 import { BackgroundToSidePanelRequestType } from 'src/background/messagePassing/types/requests'
@@ -44,8 +44,9 @@ import { syncAppWithDeviceLanguage } from 'uniswap/src/features/settings/slice'
 import Trace from 'uniswap/src/features/telemetry/Trace'
 import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
 import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
-import { UnitagUpdaterContextProvider } from 'uniswap/src/features/unitags/context'
+import { UnitagUpdaterContextProvider, useUnitagUpdater } from 'uniswap/src/features/unitags/context'
 import i18n from 'uniswap/src/i18n/i18n'
+import { getUniqueId } from 'utilities/src/device/getUniqueId'
 import { isDevEnv } from 'utilities/src/environment/env'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
@@ -54,13 +55,13 @@ import { ErrorBoundary } from 'wallet/src/components/ErrorBoundary/ErrorBoundary
 import { useTestnetModeForLoggingAndAnalytics } from 'wallet/src/features/testnetMode/hooks'
 import { SharedWalletProvider } from 'wallet/src/providers/SharedWalletProvider'
 
-getLocalUserId()
+getUniqueId()
   .then((userId) => {
     initializeSentry(SentryAppNameTag.Sidebar, userId)
   })
   .catch((error) => {
     logger.error(error, {
-      tags: { file: 'SidebarApp.tsx', function: 'getLocalUserId' },
+      tags: { file: 'SidebarApp.tsx', function: 'getUniqueId' },
     })
   })
 
@@ -205,10 +206,21 @@ function SidebarWrapper(): JSX.Element {
   useDappRequestPortListener()
   useTestnetModeForLoggingAndAnalytics()
 
+  const { triggerRefetchUnitags } = useUnitagUpdater()
+
   useEffect(() => {
     dispatch(syncAppWithDeviceLanguage())
   }, [dispatch])
 
+  useEffect(() => {
+    return backgroundToSidePanelMessageChannel.addMessageListener(
+      BackgroundToSidePanelRequestType.RefreshUnitags,
+      () => {
+        triggerRefetchUnitags()
+      },
+    )
+  }, [triggerRefetchUnitags])
+
   return (
     <>
       <WebNavigation />
@@ -245,7 +257,7 @@ export default function SidebarApp(): JSX.Element {
   return (
     <Trace>
       <PersistGate persistor={getReduxPersistor()}>
-        <ExtensionStatsigProvider>
+        <ExtensionStatsigProvider appName={SentryAppNameTag.Sidebar}>
           <I18nextProvider i18n={i18n}>
             <SharedWalletProvider reduxStore={getReduxStore()}>
               <ErrorBoundary>

apps/extension/src/app/StatsigProvider.tsx

@@ -1,31 +1,45 @@
-import { getLocalUserId } from 'src/app/utils/storage'
+import { useEffect, useState } from 'react'
+import { initializeDatadog } from 'src/app/datadog'
 import { getStatsigEnvironmentTier } from 'src/app/version'
 import Statsig from 'statsig-js' // Use JS package for browser
 import { uniswapUrls } from 'uniswap/src/constants/urls'
 import { DUMMY_STATSIG_SDK_KEY, StatsigCustomAppValue } from 'uniswap/src/features/gating/constants'
 import { StatsigOptions, StatsigProvider, StatsigUser } from 'uniswap/src/features/gating/sdk/statsig'
+import { getUniqueId } from 'utilities/src/device/getUniqueId'
 import { useAsyncData } from 'utilities/src/react/hooks'
 
 async function getStatsigUser(): Promise<StatsigUser> {
   return {
-    userID: await getLocalUserId(),
+    userID: await getUniqueId(),
     appVersion: process.env.VERSION,
     custom: {
       app: StatsigCustomAppValue.Extension,
     },
   }
 }
 
-export function ExtensionStatsigProvider({ children }: { children: React.ReactNode }): JSX.Element {
-  const { data: user } = useAsyncData(getStatsigUser)
-
-  const nonNullUser: StatsigUser = user ?? {
+export function ExtensionStatsigProvider({
+  children,
+  appName,
+}: {
+  children: React.ReactNode
+  appName: string
+}): JSX.Element {
+  const { data: storedUser } = useAsyncData(getStatsigUser)
+  const [user, setUser] = useState<StatsigUser>({
     userID: undefined,
     custom: {
       app: StatsigCustomAppValue.Extension,
     },
     appVersion: process.env.VERSION,
-  }
+  })
+  const [initFinished, setInitFinished] = useState(false)
+
+  useEffect(() => {
+    if (storedUser && initFinished) {
+      setUser(storedUser)
+    }
+  }, [storedUser, initFinished])
 
   const options: StatsigOptions = {
     environment: {
@@ -34,10 +48,14 @@ export function ExtensionStatsigProvider({ children }: { children: React.ReactNo
     api: uniswapUrls.statsigProxyUrl,
     disableAutoMetricsLogging: true,
     disableErrorLogging: true,
+    initCompletionCallback: () => {
+      setInitFinished(true)
+      initializeDatadog(appName).catch(() => undefined)
+    },
   }
 
   return (
-    <StatsigProvider options={options} sdkKey={DUMMY_STATSIG_SDK_KEY} user={nonNullUser} waitForInitialization={false}>
+    <StatsigProvider options={options} sdkKey={DUMMY_STATSIG_SDK_KEY} user={user} waitForInitialization={false}>
       {children}
     </StatsigProvider>
   )

apps/extension/src/app/UnitagClaimApp.test.tsx

@@ -0,0 +1,10 @@
+import { render } from '@testing-library/react'
+import UnitagClaimApp from 'src/app/UnitagClaimApp'
+import { initializeReduxStore } from 'src/store/store'
+
+describe('UnitagClaimApp', () => {
+  it('renders without error', async () => {
+    await initializeReduxStore()
+    render(<UnitagClaimApp />)
+  })
+})