Skip to content

Commit 111b532

Browse files
ci(release): publish latest release
1 parent 27cf6fd commit 111b532

File tree

387 files changed

+5854
-23277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

387 files changed

+5854
-23277
lines changed

.nxignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ apps/extension/dev
1010
apps/extension/build
1111
packages/*/dist
1212
packages/*/types
13-
dist/out-tsc
1413

1514
# Ignore Generator Templates
1615
tools/**/generators/**/files

CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

RELEASE

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1 @@
1-
IPFS hash of the deployment:
2-
- CIDv0: `QmQkWMh3BFN88esw7V29ibtjsX9SpUqAudnhP5puUbR9in`
3-
- CIDv1: `bafybeibd2ppkb4pcw546t3rz7rnqh7766xxlhfkh6krmahe3gdv3hske24`
4-
5-
The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
6-
7-
You can also access the Uniswap Interface from an IPFS gateway.
8-
**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.
9-
**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).
10-
Your Uniswap settings are never remembered across different URLs.
11-
12-
IPFS gateways:
13-
- https://bafybeibd2ppkb4pcw546t3rz7rnqh7766xxlhfkh6krmahe3gdv3hske24.ipfs.dweb.link/
14-
- [ipfs://QmQkWMh3BFN88esw7V29ibtjsX9SpUqAudnhP5puUbR9in/](ipfs://QmQkWMh3BFN88esw7V29ibtjsX9SpUqAudnhP5puUbR9in/)
15-
16-
### 5.121.1 (2025-12-12)
17-
18-
19-
### Bug Fixes
20-
21-
* **web:** use no-cache for useTokenPriceHistoryQuery (#26378) (#26439) 09786b8
22-
23-
1+
Various bug fixes and performance improvements

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web/5.121.1
1+
mobile/1.63.2

apps/extension/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@uniswap/analytics-events": "2.43.0",
1919
"@uniswap/client-embeddedwallet": "0.0.16",
2020
"@uniswap/sdk-core": "7.9.0",
21+
"@uniswap/uniswapx-sdk": "3.0.0-beta.7",
2122
"@uniswap/universal-router-sdk": "4.19.5",
2223
"@uniswap/v3-sdk": "3.25.2",
2324
"@uniswap/v4-sdk": "1.21.2",

apps/extension/src/app/features/dappRequests/requestContent/EthSend/Swap/SwapRequestContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useDappLastChainId } from 'src/app/features/dapp/hooks'
22
import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRequestQueueContext'
33
import { SwapDisplay } from 'src/app/features/dappRequests/requestContent/EthSend/Swap/SwapDisplay'
44
import { formatUnits, useSwapDetails } from 'src/app/features/dappRequests/requestContent/EthSend/Swap/utils'
5+
import { UniswapXSwapRequest } from 'src/app/features/dappRequests/types/Permit2Types'
56
import { UniversalRouterCall } from 'src/app/features/dappRequests/types/UniversalRouterTypes'
67
import { DEFAULT_NATIVE_ADDRESS, DEFAULT_NATIVE_ADDRESS_LEGACY } from 'uniswap/src/features/chains/evm/defaults'
78
import { useEnabledChains } from 'uniswap/src/features/chains/hooks/useEnabledChains'
@@ -12,7 +13,6 @@ import { useCurrencyInfo, useNativeCurrencyInfo } from 'uniswap/src/features/tok
1213
import { TransactionType, TransactionTypeInfo } from 'uniswap/src/features/transactions/types/transactionDetails'
1314
import { buildCurrencyId } from 'uniswap/src/utils/currencyId'
1415
import { assert } from 'utilities/src/errors'
15-
import { UniswapXSwapRequest } from 'wallet/src/components/dappRequests/types/Permit2Types'
1616

1717
function getTransactionTypeInfo({
1818
inputCurrencyInfo,

apps/extension/src/app/features/dappRequests/requestContent/PersonalSign/PersonalSignRequestContent.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ import { useDappRequestQueueContext } from 'src/app/features/dappRequests/DappRe
88
import { SignMessageRequest } from 'src/app/features/dappRequests/types/DappRequestTypes'
99
import { Flex, IconButton, Text, Tooltip } from 'ui/src'
1010
import { AlertTriangleFilled, Code, StickyNoteTextSquare } from 'ui/src/components/icons'
11-
import { zIndexes } from 'ui/src/theme'
12-
import { EthMethod } from 'uniswap/src/features/dappRequests/types'
1311
import { logger } from 'utilities/src/logger/logger'
1412
import { containsNonPrintableChars } from 'utilities/src/primitives/string'
1513
import { useBooleanState } from 'utilities/src/react/useBooleanState'
16-
import { DappPersonalSignContent } from 'wallet/src/components/dappRequests/DappPersonalSignContent'
14+
import { DappSignatureScanningContent } from 'wallet/src/components/dappRequests/DappSignatureScanningContent'
1715
import { TransactionRiskLevel } from 'wallet/src/features/dappRequests/types'
1816
import { shouldDisableConfirm } from 'wallet/src/features/dappRequests/utils/riskUtils'
1917

@@ -90,12 +88,12 @@ function PersonalSignRequestContentWithScanning({
9088
showAddressFooter={false}
9189
disableConfirm={disableConfirm}
9290
>
93-
<DappPersonalSignContent
91+
<DappSignatureScanningContent
9492
chainId={activeChain}
9593
account={currentAccount.address}
9694
message={message}
9795
isDecoded={isDecoded}
98-
method={EthMethod.PersonalSign}
96+
method="personal_sign"
9997
params={[hexMessage, currentAccount.address]}
10098
dappUrl={dappUrl}
10199
confirmedRisk={confirmedRisk}
@@ -191,7 +189,7 @@ function PersonalSignRequestContentLegacy({
191189
/>
192190
</Tooltip.Trigger>
193191
</Flex>
194-
<Tooltip.Content animationDirection="left" zIndex={zIndexes.overlay}>
192+
<Tooltip.Content animationDirection="left">
195193
<Tooltip.Arrow />
196194
<Text variant="body4">
197195
{viewEncoding === ViewEncoding.UTF8

apps/extension/src/app/features/dappRequests/requestContent/SendCalls/SendCallsRequestContent.tsx

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
ParsedCall,
1414
SendCallsRequest,
1515
} from 'src/app/features/dappRequests/types/DappRequestTypes'
16-
import { UniverseChainId } from 'uniswap/src/features/chains/types'
16+
import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
1717
import { GasFeeResult } from 'uniswap/src/features/gas/types'
1818
import { TransactionType, TransactionTypeInfo } from 'uniswap/src/features/transactions/types/transactionDetails'
1919
import { useBooleanState } from 'utilities/src/react/useBooleanState'
@@ -35,18 +35,31 @@ interface SendCallsRequestContentProps {
3535
*/
3636
function SendCallsRequestContentWithScanning({
3737
dappRequest,
38-
chainId,
3938
transactionGasFeeResult,
4039
showSmartWalletActivation,
4140
onConfirm,
4241
onCancel,
43-
}: SendCallsRequestContentProps & { chainId: UniverseChainId }): JSX.Element {
42+
}: SendCallsRequestContentProps): JSX.Element {
4443
const { t } = useTranslation()
4544
const { dappUrl, currentAccount } = useDappRequestQueueContext()
45+
const lastChainId = useDappLastChainId(dappUrl)
46+
const chainId = toSupportedChainId(dappRequest.chainId) ?? lastChainId
4647
const { value: confirmedRisk, setValue: setConfirmedRisk } = useBooleanState(false)
4748
// Initialize with null to indicate scan hasn't completed yet
4849
const [riskLevel, setRiskLevel] = useState<TransactionRiskLevel | null>(null)
4950

51+
if (!chainId) {
52+
return (
53+
<SendCallsRequestContentLegacy
54+
dappRequest={dappRequest}
55+
transactionGasFeeResult={transactionGasFeeResult}
56+
showSmartWalletActivation={showSmartWalletActivation}
57+
onConfirm={onConfirm}
58+
onCancel={onCancel}
59+
/>
60+
)
61+
}
62+
5063
const disableConfirm = shouldDisableConfirm({
5164
riskLevel,
5265
confirmedRisk,
@@ -152,10 +165,9 @@ export function SendCallsRequestHandler({ request }: { request: DappRequestStore
152165
await onCancel(request)
153166
}, [onCancel, request])
154167

155-
return blockaidTransactionScanning && chainId ? (
168+
return blockaidTransactionScanning ? (
156169
<SendCallsRequestContentWithScanning
157170
dappRequest={dappRequest}
158-
chainId={chainId}
159171
transactionGasFeeResult={gasFeeResult}
160172
showSmartWalletActivation={showSmartWalletActivation}
161173
onCancel={onCancelRequest}

packages/wallet/src/components/dappRequests/SignTypedData/DomainContent.tsx renamed to apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/DomainContent.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1+
import { MaybeExplorerLinkedAddress } from 'src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress'
2+
import { EIP712DomainType } from 'src/app/features/dappRequests/types/EIP712Types'
13
import { Flex, Text } from 'ui/src'
24
import { toSupportedChainId } from 'uniswap/src/features/chains/utils'
35
import { ExplorerDataType, getExplorerLink } from 'uniswap/src/utils/linking'
4-
import { MaybeExplorerLinkedAddress } from 'wallet/src/components/dappRequests/SignTypedData/MaybeExplorerLinkedAddress'
5-
import { EIP712DomainType } from 'wallet/src/components/dappRequests/types/EIP712Types'
66

7-
export function DomainContent({
7+
export const DomainContent = ({
88
chainId: domainChainId,
99
name,
1010
version,
1111
verifyingContract,
1212
salt,
13-
}: EIP712DomainType): JSX.Element {
13+
}: EIP712DomainType): JSX.Element => {
1414
const chainId = toSupportedChainId(domainChainId)
1515
const verifyingContractLink =
1616
chainId && verifyingContract
1717
? getExplorerLink({ chainId, data: verifyingContract, type: ExplorerDataType.ADDRESS })
1818
: undefined
1919
return (
20-
<Flex flexDirection="column" gap="$spacing6" pb="$spacing6">
20+
<>
2121
{name && (
2222
<Flex flexDirection="row" gap="$spacing8">
2323
<Text color="$neutral2" variant="body4">
@@ -66,6 +66,6 @@ export function DomainContent({
6666
</Text>
6767
</Flex>
6868
)}
69-
</Flex>
69+
</>
7070
)
7171
}

packages/wallet/src/components/dappRequests/SignTypedData/MaybeExplorerLinkedAddress.tsx renamed to apps/extension/src/app/features/dappRequests/requestContent/SignTypeData/MaybeExplorerLinkedAddress.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ interface MaybeExplorerLinkedAddressProps {
66
address: string
77
link: Maybe<string>
88
}
9-
10-
export function MaybeExplorerLinkedAddress({ address, link }: MaybeExplorerLinkedAddressProps): JSX.Element {
9+
export const MaybeExplorerLinkedAddress = ({ address, link }: MaybeExplorerLinkedAddressProps): JSX.Element => {
1110
if (!link) {
1211
return (
1312
<Text color="$neutral1" variant="body4">

0 commit comments

Comments
 (0)