ci(release): publish latest release

RELEASE

@@ -1,24 +1,10 @@
-IPFS hash of the deployment:
-- CIDv0: `QmZNKQNeHGqEJfGMyWbH1zYCgs8pazXe2FajiS4KVzxfPL`
-- CIDv1: `bafybeifd3xryjkpe4lqgqfonwz7pdfzjtdlspryilb44sn7utv26mpxab4`
+We are back with some new updates! Here’s the latest:
 
-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://bafybeifd3xryjkpe4lqgqfonwz7pdfzjtdlspryilb44sn7utv26mpxab4.ipfs.dweb.link/
-- https://bafybeifd3xryjkpe4lqgqfonwz7pdfzjtdlspryilb44sn7utv26mpxab4.ipfs.cf-ipfs.com/
-- [ipfs://QmZNKQNeHGqEJfGMyWbH1zYCgs8pazXe2FajiS4KVzxfPL/](ipfs://QmZNKQNeHGqEJfGMyWbH1zYCgs8pazXe2FajiS4KVzxfPL/)
-
-### 5.49.2 (2024-10-03)
-
-
-### Bug Fixes
-
-* **web:** dont respect url flag overrides on prod - prod (#12548) a2b2517
+Report Spam NFTs - You can now report spam NFTs and hide them from your feed and activity. 
 
+Other changes: 
 
+- Added explainers for hidden tokens, popular tokens, and hidden NFTs
+- Removed activity feed items related to any hidden NFTs
+- More optimized keyboard functionality across the app
+- Various bug fixes and performance improvements

VERSION

@@ -1 +1 @@
-web/5.49.2
+mobile/1.36

apps/extension/jest-setup.js

@@ -5,7 +5,6 @@ import { AppearanceSettingType } from 'wallet/src/features/appearance/slice'
 import { TextEncoder, TextDecoder } from 'util'
 import { mockSharedPersistQueryClientProvider } from 'uniswap/src/test/mocks/mockSharedPersistQueryClientProvider'
 import { mockUIAssets } from 'ui/src/test/mocks/mockUIAssets'
-import { mockLocalizationContext } from 'uniswap/src/test/mocks/locale'
 
 process.env.IS_UNISWAP_EXTENSION = true
 
@@ -73,8 +72,6 @@ jest.mock('wallet/src/features/appearance/hooks', () => {
   }
 })
 
-jest.mock('uniswap/src/features/language/LocalizationContext', () => mockLocalizationContext({}))
-
 jest.mock('uniswap/src/data/apiClients/SharedPersistQueryClientProvider', () => mockSharedPersistQueryClientProvider)
 
 mockUIAssets()

apps/extension/package.json

@@ -13,8 +13,8 @@
     "@svgr/webpack": "8.0.1",
     "@tamagui/core": "1.108.4",
     "@types/uuid": "9.0.1",
-    "@uniswap/analytics-events": "2.37.0",
-    "@uniswap/uniswapx-sdk": "^2.1.0-beta.14",
+    "@uniswap/analytics-events": "2.36.0",
+    "@uniswap/uniswapx-sdk": "^2.1.0-beta.8",
     "@uniswap/universal-router-sdk": "2.2.0",
     "@uniswap/v3-sdk": "3.14.0",
     "dotenv-webpack": "8.0.1",

apps/extension/src/app/OnboardingApp.tsx

@@ -9,7 +9,6 @@ import { PersistGate } from 'redux-persist/integration/react'
 import { ExtensionStatsigProvider } from 'src/app/StatsigProvider'
 import { GraphqlProvider } from 'src/app/apollo'
 import { ErrorElement } from 'src/app/components/ErrorElement'
-import { ClaimUnitagScreen } from 'src/app/features/onboarding/ClaimUnitagScreen'
 import { Complete } from 'src/app/features/onboarding/Complete'
 import {
   CreateOnboardingSteps,
@@ -56,14 +55,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,16 +66,15 @@ const allRoutes = [
   },
   {
     path: OnboardingRoutes.Create,
-    element: <OnboardingStepsProvider key={OnboardingRoutes.Create} steps={createSteps} />,
-  },
-  {
-    path: OnboardingRoutes.Claim,
     element: (
       <OnboardingStepsProvider
-        key={OnboardingRoutes.Claim}
+        key={OnboardingRoutes.Create}
         steps={{
-          [CreateOnboardingSteps.ClaimUnitag]: <ClaimUnitagScreen />,
-          ...createSteps,
+          [CreateOnboardingSteps.Password]: <PasswordCreate />,
+          [CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
+          [CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
+          [CreateOnboardingSteps.Naming]: <NameWallet />,
+          [CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
         }}
       />
     ),

apps/extension/src/app/features/accounts/AccountItem.tsx

@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'
 import { EditLabelModal } from 'src/app/features/accounts/EditLabelModal'
 import { removeAllDappConnectionsForAccount } from 'src/app/features/dapp/actions'
 import { ContextMenu, Flex, MenuContentItem, Text, TouchableArea } from 'ui/src'
-import { CopySheets, Edit, Ellipsis, TrashFilled } from 'ui/src/components/icons'
+import { CopySheets, Edit, TrashFilled, TripleDots } from 'ui/src/components/icons'
 import { iconSizes } from 'ui/src/theme'
 import { WarningModal } from 'uniswap/src/components/modals/WarningModal/WarningModal'
 import { WarningSeverity } from 'uniswap/src/components/modals/WarningModal/types'
@@ -131,15 +131,15 @@ export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountIte
         caption={t('account.recoveryPhrase.remove.mnemonic.description', {
           walletNames: [activeAccountDisplayName?.name ?? ''],
         })}
-        rejectText={t('common.button.cancel')}
-        acknowledgeText={t('common.button.continue')}
+        closeText={t('common.button.cancel')}
+        confirmText={t('common.button.continue')}
         icon={<TrashFilled color="$statusCritical" size="$icon.24" strokeWidth="$spacing1" />}
         isOpen={showRemoveWalletModal}
         modalName={ModalName.RemoveWallet}
         severity={WarningSeverity.High}
         title={t('account.wallet.remove.title', { name: displayName?.name ?? '' })}
         onClose={() => setShowRemoveWalletModal(false)}
-        onAcknowledge={onRemoveWallet}
+        onConfirm={onRemoveWallet}
       />
       <EditLabelModal address={address} isOpen={showEditLabelModal} onClose={() => setShowEditLabelModal(false)} />
       <TouchableArea
@@ -179,7 +179,7 @@ export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountIte
                 opacity={0}
                 p="$spacing4"
               >
-                <Ellipsis color="$neutral2" size="$icon.16" />
+                <TripleDots color="$neutral2" size="$icon.16" />
               </Flex>
             </ContextMenu>
           </Flex>

apps/extension/src/app/features/accounts/AccountSwitcherScreen.tsx

@@ -166,15 +166,15 @@ export function AccountSwitcherScreen(): JSX.Element {
       />
       <WarningModal
         caption={t('account.recoveryPhrase.remove.import.description')}
-        rejectText={t('common.button.cancel')}
-        acknowledgeText={t('common.button.continue')}
+        closeText={t('common.button.cancel')}
+        confirmText={t('common.button.continue')}
         icon={<WalletFilled color="$statusCritical" size="$icon.24" />}
         isOpen={showRemoveWalletModal}
         modalName={ModalName.RemoveWallet}
         severity={WarningSeverity.High}
         title={t('account.wallet.button.import')}
         onClose={() => setShowRemoveWalletModal(false)}
-        onAcknowledge={onNavigateToRemoveWallet}
+        onConfirm={onNavigateToRemoveWallet}
       />
       <CreateWalletModal
         isOpen={showCreateWalletModal}

apps/extension/src/app/features/dapp/store.ts

@@ -1,4 +1,3 @@
-import { cloneDeep } from '@apollo/client/utilities'
 import EventEmitter from 'eventemitter3'
 import { getOrderedConnectedAddresses, isConnectedAccount } from 'src/app/features/dapp/utils'
 import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
@@ -224,28 +223,31 @@ function removeAccountDappConnections(account: Account): void {
  * @returns the updated state
  */
 function removeDappConnectionHelper(initialState: DappState, dappUrl: string, account?: Account): DappState {
-  const newState = cloneDeep(initialState)
-  const dappInfo = newState[dappUrl]
+  const dappUrlState = initialState[dappUrl]
 
-  if (!dappInfo) {
+  if (!dappUrlState) {
     return initialState
   }
 
-  dappInfo.connectedAccounts = dappInfo.connectedAccounts.filter(
-    (existingAccount) => existingAccount.address !== account?.address,
-  )
-
-  const nextConnectedAccount = dappInfo.connectedAccounts[0]
-
-  if (!nextConnectedAccount || !account) {
-    delete newState[dappUrl]
-    return newState
-  }
-
-  if (dappInfo.activeConnectedAddress === account.address) {
-    dappInfo.activeConnectedAddress = nextConnectedAccount.address
+  const updatedAccounts = account
+    ? dappUrlState.connectedAccounts?.filter((existingAccount) => existingAccount.address !== account.address)
+    : []
+
+  const activeConnected = updatedAccounts[0]
+  if (activeConnected) {
+    return {
+      ...initialState,
+      [dappUrl]: {
+        ...dappUrlState,
+        connectedAccounts: updatedAccounts,
+        activeConnectedAddress: activeConnected.address,
+      },
+    }
+  } else {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { [dappUrl]: _, ...restState } = initialState
+    return restState
   }
-  return newState
 }
 
 function removeAllDappConnections(): void {

apps/extension/src/app/features/dappRequests/DappRequestContent.tsx

@@ -237,14 +237,14 @@ export function DappRequestFooter({
           px="$spacing8"
         />
         <Flex row gap="$spacing12" pt="$spacing8">
-          <Button flex={1} flexBasis={1} size="medium" theme="secondary" onPress={handleOnCancel}>
+          <Button flex={1} flexBasis={1} size="small" theme="secondary" onPress={handleOnCancel}>
             {t('common.button.cancel')}
           </Button>
           <Button
             disabled={isConfirmDisabled}
             flex={1}
             flexBasis={1}
-            size="medium"
+            size="small"
             theme="primary"
             onPress={handleOnConfirm}
           >

apps/extension/src/app/features/dappRequests/accounts.ts

@@ -88,7 +88,7 @@ export function* saveAccount({ url, favIconUrl }: SenderTabInfo) {
   const dappInfo = yield* call(dappStore.getDappInfo, dappUrl)
 
   if (!dappUrl || !activeAccount) {
-    return undefined
+    return
   }
 
   yield* call(saveDappConnection, dappUrl, activeAccount, favIconUrl)

apps/extension/src/app/features/dappRequests/requestContent/EthSend/Approve/ApproveRequestContent.tsx

@@ -69,9 +69,11 @@ export function ApproveRequestContent({
   const { parsedTransactionData } = useNoYoloParser(dappRequest.transaction, activeChain)
 
   // To detect a revoke, both the transaction value and the parsed arg amount value must be zero
-  const isArgAmountZero = parsedTransactionData?.args.some(
-    (arg) => typeof arg === 'object' && arg._hex && BigNumber.from(arg._hex).isZero(),
-  )
+  const isArgAmountZero = parsedTransactionData?.args.some((arg) => {
+    if (typeof arg === 'object' && arg._hex) {
+      return BigNumber.from(arg._hex).isZero()
+    }
+  })
   const isRevoke = dappRequest.transaction.value === '0x0' && isArgAmountZero
 
   const tokenInfo = useDappRequestTokenRecipientInfo(dappRequest, dappUrl)

apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/SignTypedDataRequestContent.tsx

@@ -88,8 +88,6 @@ export function SignTypedDataRequestContent({ dappRequest }: SignTypedDataReques
         </Flex>
       ))
     }
-
-    return undefined
   }
 
   return (

apps/extension/src/app/features/dappRequests/utils.ts

@@ -12,7 +12,6 @@ function parseUrl(url?: string): URL | undefined {
       tags: { file: 'dappRequests/utils', function: 'extractBaseUrl' },
       extra: { url },
     })
-    return undefined
   }
 }
 

apps/extension/src/app/features/home/HomeScreen.tsx

@@ -8,7 +8,6 @@ import { NftsTab } from 'src/app/components/tabs/NftsTab'
 import { PortfolioActionButtons } from 'src/app/features/home/PortfolioActionButtons'
 import { PortfolioHeader } from 'src/app/features/home/PortfolioHeader'
 import { TokenBalanceList } from 'src/app/features/home/TokenBalanceList'
-import { HomeIntroCardStack } from 'src/app/features/home/introCards/HomeIntroCardStack'
 import { PinReminder } from 'src/app/features/onboarding/PinReminder'
 import { selectAlertsState } from 'src/app/features/onboarding/alerts/selectors'
 import { AlertName, closeAlert } from 'src/app/features/onboarding/alerts/slice'
@@ -130,8 +129,6 @@ export const HomeScreen = memo(function _HomeScreen(): JSX.Element {
 
             <PortfolioActionButtons />
 
-            <HomeIntroCardStack />
-
             <Flex flex={1} width="100%">
               <Flex row gap="$spacing16" px="$spacing4" py="$spacing8">
                 <TabButton isActive={selectedTab === HomeTabs.Tokens} onPress={() => setSelectedTab(HomeTabs.Tokens)}>

apps/extension/src/app/features/home/TokenBalanceList.tsx

@@ -161,7 +161,7 @@ const TokenBalanceItemRow = memo(function TokenBalanceItemRow({ item }: { item:
           }}
         />
         {hiddenTokensExpanded && (
-          <Flex>
+          <Flex mx="$spacing12">
             <InformationBanner infoText={t('hidden.tokens.info.banner.text')} onPress={handlePressToken} />
           </Flex>
         )}

apps/extension/src/app/features/onboarding/OnboardingScreen.tsx

@@ -7,7 +7,7 @@ export function OnboardingScreen(props: OnboardingScreenProps): null {
 
   useLayoutEffect(() => {
     if (!context) {
-      return undefined
+      return
     }
     context.setOnboardingScreen(props)
     return () => {