Skip to content

Commit f5bd214

Browse files
hello-happy-puppyhello-happy-puppy
committed
ci(release): publish latest release
1 parent 6032cdd commit f5bd214

File tree

629 files changed

+21575
-4929
lines changed

Some content is hidden

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

629 files changed

+21575
-4929
lines changed

‎CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @uniswap/web-admins

‎RELEASE

+59-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,63 @@
1-
We are back with some new updates! Here’s the latest:
1+
IPFS hash of the deployment:
2+
- CIDv0: `Qmd28dj63MAN4SSYPnXMSDe5bKUbnwSFKijHz59isELY4t`
3+
- CIDv1: `bafybeig2edl4hxzvem7w6ujx735fox2jnpdaizovofieutl3rvawydroqu`
24

3-
Manage dapp connections - Users can now see all dapps they’re connected to, and disconnect to one or all of them.
5+
The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
46

5-
Report Spam NFTs - You can now report spam NFTs and hide them from your feed and activity.
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://bafybeig2edl4hxzvem7w6ujx735fox2jnpdaizovofieutl3rvawydroqu.ipfs.dweb.link/
14+
- https://bafybeig2edl4hxzvem7w6ujx735fox2jnpdaizovofieutl3rvawydroqu.ipfs.cf-ipfs.com/
15+
- [ipfs://Qmd28dj63MAN4SSYPnXMSDe5bKUbnwSFKijHz59isELY4t/](ipfs://Qmd28dj63MAN4SSYPnXMSDe5bKUbnwSFKijHz59isELY4t/)
16+
17+
## 5.49.0 (2024-10-01)
18+
19+
20+
### Features
21+
22+
* **web:** [1/2] fee tier selection modal (#12092) fa1f56d
23+
* **web:** [2/2] fee tier selection modal (create new) (#12110) 780bbc0
24+
* **web:** add fee tier and price range selection to migrate page (#12064) f417a3f
25+
* **web:** add fiat values props to swap logs in new saga (#12215) 857119c
26+
* **web:** add price impact events (#12208) 30b8c39
27+
* **web:** add total_balances_usd prop to swap logs in new saga (#12173) 79a0b17
28+
* **web:** add UniswapX priority orders in swap flow (#12088) d55a9bd
29+
* **web:** add uniswapx saga to shared web flow (#11973) d10498e
30+
* **web:** add url param to create positions page (#12212) b89e5d1
31+
* **web:** add wrap saga for shared flow (#11971) f14a41a
32+
* **web:** adding multiple protocols to create page (#12132) b4bff49
33+
* **web:** changing create page based on version (#12136) bc16817
34+
* **web:** classic swap saga (#11922) f74c332
35+
* **web:** keep input to all networks unless output selected (#12274) e43b95d
36+
* **web:** log SWAP_MODIFIED_IN_WALLET event in new swap saga (#12247) 16e9f56
37+
* **web:** log SWAP_SIGNED event in new swag saga (#12170) 2494b9d
38+
* **web:** log UniswapXOrderPostError and UniswapXSignatureRequested in new saga (#12114) 454666b
39+
* **web:** log UniswapXOrderSubmitted in new saga (#12113) 9ae3373
40+
* **web:** pulling from backend for create page (#12143) 8f6aa1e
41+
* **web:** swap saga notifications (#12070) e28ec03
42+
* **web:** v2 position page refreshed (#11972) da6c705
43+
* **web:** v4 Position detail page (#11904) a735564
44+
45+
46+
### Bug Fixes
47+
48+
* **web:** fix AddressQRModal eyeSize (#12318) 33f8160
49+
* **web:** fix language file mapping (#12207) bbfe66d
50+
* **web:** fix overflow issue in search results (#12158) fbd7358
51+
* **web:** limit form button color should be neutralContrast (#12416) d923cdd
52+
* **web:** shared swap landing page (#12026) fe2d0b6
53+
* **web:** token caching fix in mini portfolio (#12149) 4c2d402
54+
* **web:** token selector height (#12028) 3adb0d0
55+
* **web:** use percentFromFloat (#12142) 18f819b
56+
* **web:** use swap saga prefilled state (#12082) c6bd810
57+
58+
59+
### Continuous Integration
60+
61+
* **web:** update sitemaps d8b4a5a
662

7-
Other changes:
863

9-
- Added explainers for hidden tokens, popular tokens, and hidden NFTs
10-
- Removed activity feed items related to any hidden NFTs
11-
- Various bug fixes and performance improvements

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
extension/1.6.0
1+
web/5.49.0

‎apps/extension/jest-setup.js

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { AppearanceSettingType } from 'wallet/src/features/appearance/slice'
55
import { TextEncoder, TextDecoder } from 'util'
66
import { mockSharedPersistQueryClientProvider } from 'uniswap/src/test/mocks/mockSharedPersistQueryClientProvider'
77
import { mockUIAssets } from 'ui/src/test/mocks/mockUIAssets'
8+
import { mockLocalizationContext } from 'uniswap/src/test/mocks/locale'
89

910
process.env.IS_UNISWAP_EXTENSION = true
1011

@@ -72,6 +73,8 @@ jest.mock('wallet/src/features/appearance/hooks', () => {
7273
}
7374
})
7475

76+
jest.mock('uniswap/src/features/language/LocalizationContext', () => mockLocalizationContext({}))
77+
7578
jest.mock('uniswap/src/data/apiClients/SharedPersistQueryClientProvider', () => mockSharedPersistQueryClientProvider)
7679

7780
mockUIAssets()

‎apps/extension/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"@svgr/webpack": "8.0.1",
1414
"@tamagui/core": "1.108.4",
1515
"@types/uuid": "9.0.1",
16-
"@uniswap/analytics-events": "2.36.0",
17-
"@uniswap/uniswapx-sdk": "^2.1.0-beta.8",
16+
"@uniswap/analytics-events": "2.37.0",
17+
"@uniswap/uniswapx-sdk": "^2.1.0-beta.14",
1818
"@uniswap/universal-router-sdk": "2.2.0",
1919
"@uniswap/v3-sdk": "3.14.0",
2020
"dotenv-webpack": "8.0.1",

‎apps/extension/src/app/OnboardingApp.tsx

+16-6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { PersistGate } from 'redux-persist/integration/react'
99
import { ExtensionStatsigProvider } from 'src/app/StatsigProvider'
1010
import { GraphqlProvider } from 'src/app/apollo'
1111
import { ErrorElement } from 'src/app/components/ErrorElement'
12+
import { ClaimUnitagScreen } from 'src/app/features/onboarding/ClaimUnitagScreen'
1213
import { Complete } from 'src/app/features/onboarding/Complete'
1314
import {
1415
CreateOnboardingSteps,
@@ -55,6 +56,14 @@ const unsupportedRoute: RouteObject = {
5556
element: <UnsupportedBrowserScreen />,
5657
}
5758

59+
const createSteps = {
60+
[CreateOnboardingSteps.Password]: <PasswordCreate />,
61+
[CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
62+
[CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
63+
[CreateOnboardingSteps.Naming]: <NameWallet />,
64+
[CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
65+
}
66+
5867
const allRoutes = [
5968
{
6069
path: '',
@@ -66,15 +75,16 @@ const allRoutes = [
6675
},
6776
{
6877
path: OnboardingRoutes.Create,
78+
element: <OnboardingStepsProvider key={OnboardingRoutes.Create} steps={createSteps} />,
79+
},
80+
{
81+
path: OnboardingRoutes.Claim,
6982
element: (
7083
<OnboardingStepsProvider
71-
key={OnboardingRoutes.Create}
84+
key={OnboardingRoutes.Claim}
7285
steps={{
73-
[CreateOnboardingSteps.Password]: <PasswordCreate />,
74-
[CreateOnboardingSteps.ViewMnemonic]: <ViewMnemonic />,
75-
[CreateOnboardingSteps.TestMnemonic]: <TestMnemonic />,
76-
[CreateOnboardingSteps.Naming]: <NameWallet />,
77-
[CreateOnboardingSteps.Complete]: <Complete flow={ExtensionOnboardingFlow.New} />,
86+
[CreateOnboardingSteps.ClaimUnitag]: <ClaimUnitagScreen />,
87+
...createSteps,
7888
}}
7989
/>
8090
),

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux'
55
import { EditLabelModal } from 'src/app/features/accounts/EditLabelModal'
66
import { removeAllDappConnectionsForAccount } from 'src/app/features/dapp/actions'
77
import { ContextMenu, Flex, MenuContentItem, Text, TouchableArea } from 'ui/src'
8-
import { CopySheets, Edit, TrashFilled, TripleDots } from 'ui/src/components/icons'
8+
import { CopySheets, Edit, Ellipsis, TrashFilled } from 'ui/src/components/icons'
99
import { iconSizes } from 'ui/src/theme'
1010
import { WarningModal } from 'uniswap/src/components/modals/WarningModal/WarningModal'
1111
import { WarningSeverity } from 'uniswap/src/components/modals/WarningModal/types'
@@ -131,15 +131,15 @@ export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountIte
131131
caption={t('account.recoveryPhrase.remove.mnemonic.description', {
132132
walletNames: [activeAccountDisplayName?.name ?? ''],
133133
})}
134-
closeText={t('common.button.cancel')}
135-
confirmText={t('common.button.continue')}
134+
rejectText={t('common.button.cancel')}
135+
acknowledgeText={t('common.button.continue')}
136136
icon={<TrashFilled color="$statusCritical" size="$icon.24" strokeWidth="$spacing1" />}
137137
isOpen={showRemoveWalletModal}
138138
modalName={ModalName.RemoveWallet}
139139
severity={WarningSeverity.High}
140140
title={t('account.wallet.remove.title', { name: displayName?.name ?? '' })}
141141
onClose={() => setShowRemoveWalletModal(false)}
142-
onConfirm={onRemoveWallet}
142+
onAcknowledge={onRemoveWallet}
143143
/>
144144
<EditLabelModal address={address} isOpen={showEditLabelModal} onClose={() => setShowEditLabelModal(false)} />
145145
<TouchableArea
@@ -179,7 +179,7 @@ export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountIte
179179
opacity={0}
180180
p="$spacing4"
181181
>
182-
<TripleDots color="$neutral2" size="$icon.16" />
182+
<Ellipsis color="$neutral2" size="$icon.16" />
183183
</Flex>
184184
</ContextMenu>
185185
</Flex>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,15 @@ export function AccountSwitcherScreen(): JSX.Element {
166166
/>
167167
<WarningModal
168168
caption={t('account.recoveryPhrase.remove.import.description')}
169-
closeText={t('common.button.cancel')}
170-
confirmText={t('common.button.continue')}
169+
rejectText={t('common.button.cancel')}
170+
acknowledgeText={t('common.button.continue')}
171171
icon={<WalletFilled color="$statusCritical" size="$icon.24" />}
172172
isOpen={showRemoveWalletModal}
173173
modalName={ModalName.RemoveWallet}
174174
severity={WarningSeverity.High}
175175
title={t('account.wallet.button.import')}
176176
onClose={() => setShowRemoveWalletModal(false)}
177-
onConfirm={onNavigateToRemoveWallet}
177+
onAcknowledge={onNavigateToRemoveWallet}
178178
/>
179179
<CreateWalletModal
180180
isOpen={showCreateWalletModal}

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

+18-20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { cloneDeep } from '@apollo/client/utilities'
12
import EventEmitter from 'eventemitter3'
23
import { getOrderedConnectedAddresses, isConnectedAccount } from 'src/app/features/dapp/utils'
34
import { UniverseChainId, WalletChainId } from 'uniswap/src/types/chains'
@@ -223,31 +224,28 @@ function removeAccountDappConnections(account: Account): void {
223224
* @returns the updated state
224225
*/
225226
function removeDappConnectionHelper(initialState: DappState, dappUrl: string, account?: Account): DappState {
226-
const dappUrlState = initialState[dappUrl]
227+
const newState = cloneDeep(initialState)
228+
const dappInfo = newState[dappUrl]
227229

228-
if (!dappUrlState) {
230+
if (!dappInfo) {
229231
return initialState
230232
}
231233

232-
const updatedAccounts = account
233-
? dappUrlState.connectedAccounts?.filter((existingAccount) => existingAccount.address !== account.address)
234-
: []
235-
236-
const activeConnected = updatedAccounts[0]
237-
if (activeConnected) {
238-
return {
239-
...initialState,
240-
[dappUrl]: {
241-
...dappUrlState,
242-
connectedAccounts: updatedAccounts,
243-
activeConnectedAddress: activeConnected.address,
244-
},
245-
}
246-
} else {
247-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
248-
const { [dappUrl]: _, ...restState } = initialState
249-
return restState
234+
dappInfo.connectedAccounts = dappInfo.connectedAccounts.filter(
235+
(existingAccount) => existingAccount.address !== account?.address,
236+
)
237+
238+
const nextConnectedAccount = dappInfo.connectedAccounts[0]
239+
240+
if (!nextConnectedAccount || !account) {
241+
delete newState[dappUrl]
242+
return newState
243+
}
244+
245+
if (dappInfo.activeConnectedAddress === account.address) {
246+
dappInfo.activeConnectedAddress = nextConnectedAccount.address
250247
}
248+
return newState
251249
}
252250

253251
function removeAllDappConnections(): void {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ export function DappRequestFooter({
237237
px="$spacing8"
238238
/>
239239
<Flex row gap="$spacing12" pt="$spacing8">
240-
<Button flex={1} flexBasis={1} size="small" theme="secondary" onPress={handleOnCancel}>
240+
<Button flex={1} flexBasis={1} size="medium" theme="secondary" onPress={handleOnCancel}>
241241
{t('common.button.cancel')}
242242
</Button>
243243
<Button
244244
disabled={isConfirmDisabled}
245245
flex={1}
246246
flexBasis={1}
247-
size="small"
247+
size="medium"
248248
theme="primary"
249249
onPress={handleOnConfirm}
250250
>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export function* saveAccount({ url, favIconUrl }: SenderTabInfo) {
8888
const dappInfo = yield* call(dappStore.getDappInfo, dappUrl)
8989

9090
if (!dappUrl || !activeAccount) {
91-
return
91+
return undefined
9292
}
9393

9494
yield* call(saveDappConnection, dappUrl, activeAccount, favIconUrl)

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,9 @@ export function ApproveRequestContent({
6969
const { parsedTransactionData } = useNoYoloParser(dappRequest.transaction, activeChain)
7070

7171
// To detect a revoke, both the transaction value and the parsed arg amount value must be zero
72-
const isArgAmountZero = parsedTransactionData?.args.some((arg) => {
73-
if (typeof arg === 'object' && arg._hex) {
74-
return BigNumber.from(arg._hex).isZero()
75-
}
76-
})
72+
const isArgAmountZero = parsedTransactionData?.args.some(
73+
(arg) => typeof arg === 'object' && arg._hex && BigNumber.from(arg._hex).isZero(),
74+
)
7775
const isRevoke = dappRequest.transaction.value === '0x0' && isArgAmountZero
7876

7977
const tokenInfo = useDappRequestTokenRecipientInfo(dappRequest, dappUrl)

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

+2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ export function SignTypedDataRequestContent({ dappRequest }: SignTypedDataReques
8888
</Flex>
8989
))
9090
}
91+
92+
return undefined
9193
}
9294

9395
return (

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ function parseUrl(url?: string): URL | undefined {
1212
tags: { file: 'dappRequests/utils', function: 'extractBaseUrl' },
1313
extra: { url },
1414
})
15+
return undefined
1516
}
1617
}
1718

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

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { NftsTab } from 'src/app/components/tabs/NftsTab'
88
import { PortfolioActionButtons } from 'src/app/features/home/PortfolioActionButtons'
99
import { PortfolioHeader } from 'src/app/features/home/PortfolioHeader'
1010
import { TokenBalanceList } from 'src/app/features/home/TokenBalanceList'
11+
import { HomeIntroCardStack } from 'src/app/features/home/introCards/HomeIntroCardStack'
1112
import { PinReminder } from 'src/app/features/onboarding/PinReminder'
1213
import { selectAlertsState } from 'src/app/features/onboarding/alerts/selectors'
1314
import { AlertName, closeAlert } from 'src/app/features/onboarding/alerts/slice'
@@ -129,6 +130,8 @@ export const HomeScreen = memo(function _HomeScreen(): JSX.Element {
129130

130131
<PortfolioActionButtons />
131132

133+
<HomeIntroCardStack />
134+
132135
<Flex flex={1} width="100%">
133136
<Flex row gap="$spacing16" px="$spacing4" py="$spacing8">
134137
<TabButton isActive={selectedTab === HomeTabs.Tokens} onPress={() => setSelectedTab(HomeTabs.Tokens)}>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ const TokenBalanceItemRow = memo(function TokenBalanceItemRow({ item }: { item:
161161
}}
162162
/>
163163
{hiddenTokensExpanded && (
164-
<Flex mx="$spacing12">
164+
<Flex>
165165
<InformationBanner infoText={t('hidden.tokens.info.banner.text')} onPress={handlePressToken} />
166166
</Flex>
167167
)}

‎apps/extension/src/app/features/home/introCards/HomeIntroCardStack.tsx

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { Flex } from 'ui/src'
2+
import { IntroCardStack } from 'wallet/src/components/introCards/IntroCardStack'
3+
import { useSharedIntroCards } from 'wallet/src/components/introCards/useSharedIntroCards'
4+
5+
export function HomeIntroCardStack(): JSX.Element | null {
6+
const cards = useSharedIntroCards({
7+
navigateToUnitagClaim: () => {},
8+
navigateToUnitagIntro: () => {},
9+
})
10+
11+
if (!cards.length) {
12+
return null
13+
}
14+
15+
return (
16+
<Flex py="$spacing4">
17+
<IntroCardStack cards={cards} />
18+
</Flex>
19+
)
20+
}

0 commit comments

Comments
 (0)