Skip to content

Commit 6032cdd

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

File tree

184 files changed

+4036
-10385
lines changed

Some content is hidden

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

184 files changed

+4036
-10385
lines changed

‎CODEOWNERS

-1
This file was deleted.

‎RELEASE

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
IPFS hash of the deployment:
2-
- CIDv0: `QmSen79xDfziDqosVLQFWT5F1cxK7pYHirdnMMkCjZqtDz`
3-
- CIDv1: `bafybeicacoiqphc6t7aqqtkawiwotwqxwxqdtapccc4iy64xx3ompux7du`
1+
We are back with some new updates! Here’s the latest:
42

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

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://bafybeicacoiqphc6t7aqqtkawiwotwqxwxqdtapccc4iy64xx3ompux7du.ipfs.dweb.link/
14-
- https://bafybeicacoiqphc6t7aqqtkawiwotwqxwxqdtapccc4iy64xx3ompux7du.ipfs.cf-ipfs.com/
15-
- [ipfs://QmSen79xDfziDqosVLQFWT5F1cxK7pYHirdnMMkCjZqtDz/](ipfs://QmSen79xDfziDqosVLQFWT5F1cxK7pYHirdnMMkCjZqtDz/)
16-
17-
### 5.48.1 (2024-09-24)
5+
Report Spam NFTs - You can now report spam NFTs and hide them from your feed and activity.
186

7+
Other changes:
198

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-
web/5.48.1
1+
extension/1.6.0

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

+2-2
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, Ellipsis, TrashFilled } from 'ui/src/components/icons'
8+
import { CopySheets, Edit, TrashFilled, TripleDots } 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'
@@ -179,7 +179,7 @@ export function AccountItem({ address, onAccountSelect, balanceUSD }: AccountIte
179179
opacity={0}
180180
p="$spacing4"
181181
>
182-
<Ellipsis color="$neutral2" size="$icon.16" />
182+
<TripleDots color="$neutral2" size="$icon.16" />
183183
</Flex>
184184
</ContextMenu>
185185
</Flex>

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

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

230-
if (!dappInfo) {
228+
if (!dappUrlState) {
231229
return initialState
232230
}
233231

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
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
247250
}
248-
return newState
249251
}
250252

251253
function removeAllDappConnections(): void {

‎apps/extension/src/app/features/onboarding/create/ViewMnemonic.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export function ViewMnemonic(): JSX.Element {
132132
) : (
133133
<Flex gap="$spacing16" my="$spacing24" pt="$spacing8" width="100%">
134134
<MnemonicViewer mnemonic={onboardingAccountMnemonic} />
135-
<Flex backgroundColor="$surface2" borderRadius="$rounded16" p="$spacing12">
135+
<Flex backgroundColor="$surface2" borderRadius="$rounded16" p="$spacing12" overflow="hidden">
136136
<LabeledCheckbox
137137
checked={disclaimerChecked}
138138
text={<Text variant="body3">{t('onboarding.backup.view.disclaimer')}</Text>}

‎apps/extension/src/app/features/settings/SettingsManageConnectionsScreen/internal/EllipsisDropdown.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'
22
import { useDispatch } from 'react-redux'
33
import { removeAllDappConnectionsForAccount } from 'src/app/features/dapp/actions'
44
import { ContextMenu, Flex, TouchableArea } from 'ui/src'
5-
import { Ellipsis, Power } from 'ui/src/components/icons'
5+
import { Power, TripleDots } from 'ui/src/components/icons'
66
import { ExtensionEventName } from 'uniswap/src/features/telemetry/constants'
77
import { sendAnalyticsEvent } from 'uniswap/src/features/telemetry/send'
88
import { pushNotification } from 'wallet/src/features/notifications/slice'
@@ -49,7 +49,7 @@ export function EllipsisDropdown(): JSX.Element {
4949
onLeftClick={true}
5050
>
5151
<TouchableArea borderRadius="$roundedFull" hoverStyle={{ backgroundColor: '$surface2Hovered' }} p="$spacing8">
52-
<Ellipsis color="$neutral2" size="$icon.16" />
52+
<TripleDots color="$neutral2" size="$icon.16" />
5353
</TouchableArea>
5454
</ContextMenu>
5555
)

‎apps/extension/src/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 3,
33
"name": "Uniswap Extension",
44
"description": "The Uniswap Extension is a self-custody crypto wallet that's built for swapping.",
5-
"version": "1.7.0",
5+
"version": "1.6.0",
66
"minimum_chrome_version": "116",
77
"icons": {
88
"16": "assets/icon16.png",

‎apps/mobile/android/app/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ if (isCI && datadogPropertiesAvailable && !isDetox) {
9090
apply from: "../../../../node_modules/@datadog/mobile-react-native/datadog-sourcemaps.gradle"
9191
}
9292

93-
def devVersionName = "1.37"
94-
def betaVersionName = "1.37"
95-
def prodVersionName = "1.37"
93+
def devVersionName = "1.36"
94+
def betaVersionName = "1.36"
95+
def prodVersionName = "1.36"
9696

9797
android {
9898
ndkVersion rootProject.ext.ndkVersion

‎apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj

+24-24
Original file line numberDiff line numberDiff line change
@@ -2167,7 +2167,7 @@
21672167
"@executable_path/Frameworks",
21682168
"@loader_path/Frameworks",
21692169
);
2170-
MARKETING_VERSION = 1.37;
2170+
MARKETING_VERSION = 1.36;
21712171
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
21722172
MTL_FAST_MATH = YES;
21732173
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2220,7 +2220,7 @@
22202220
"@executable_path/Frameworks",
22212221
"@loader_path/Frameworks",
22222222
);
2223-
MARKETING_VERSION = 1.37;
2223+
MARKETING_VERSION = 1.36;
22242224
MTL_FAST_MATH = YES;
22252225
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
22262226
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2273,7 +2273,7 @@
22732273
"@executable_path/Frameworks",
22742274
"@loader_path/Frameworks",
22752275
);
2276-
MARKETING_VERSION = 1.37;
2276+
MARKETING_VERSION = 1.36;
22772277
MTL_FAST_MATH = YES;
22782278
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
22792279
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2326,7 +2326,7 @@
23262326
"@executable_path/Frameworks",
23272327
"@loader_path/Frameworks",
23282328
);
2329-
MARKETING_VERSION = 1.37;
2329+
MARKETING_VERSION = 1.36;
23302330
MTL_FAST_MATH = YES;
23312331
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
23322332
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCore;
@@ -2364,7 +2364,7 @@
23642364
GCC_C_LANGUAGE_STANDARD = gnu11;
23652365
GENERATE_INFOPLIST_FILE = YES;
23662366
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2367-
MARKETING_VERSION = 1.37;
2367+
MARKETING_VERSION = 1.36;
23682368
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
23692369
MTL_FAST_MATH = YES;
23702370
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2400,7 +2400,7 @@
24002400
GCC_C_LANGUAGE_STANDARD = gnu11;
24012401
GENERATE_INFOPLIST_FILE = YES;
24022402
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2403-
MARKETING_VERSION = 1.37;
2403+
MARKETING_VERSION = 1.36;
24042404
MTL_FAST_MATH = YES;
24052405
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
24062406
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2435,7 +2435,7 @@
24352435
GCC_C_LANGUAGE_STANDARD = gnu11;
24362436
GENERATE_INFOPLIST_FILE = YES;
24372437
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2438-
MARKETING_VERSION = 1.37;
2438+
MARKETING_VERSION = 1.36;
24392439
MTL_FAST_MATH = YES;
24402440
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
24412441
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2470,7 +2470,7 @@
24702470
GCC_C_LANGUAGE_STANDARD = gnu11;
24712471
GENERATE_INFOPLIST_FILE = YES;
24722472
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
2473-
MARKETING_VERSION = 1.37;
2473+
MARKETING_VERSION = 1.36;
24742474
MTL_FAST_MATH = YES;
24752475
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
24762476
PRODUCT_BUNDLE_IDENTIFIER = schemes.WidgetsCoreTests;
@@ -2517,7 +2517,7 @@
25172517
"@executable_path/Frameworks",
25182518
"@executable_path/../../Frameworks",
25192519
);
2520-
MARKETING_VERSION = 1.37;
2520+
MARKETING_VERSION = 1.36;
25212521
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
25222522
MTL_FAST_MATH = YES;
25232523
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2563,7 +2563,7 @@
25632563
"@executable_path/Frameworks",
25642564
"@executable_path/../../Frameworks",
25652565
);
2566-
MARKETING_VERSION = 1.37;
2566+
MARKETING_VERSION = 1.36;
25672567
MTL_FAST_MATH = YES;
25682568
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
25692569
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.widgets;
@@ -2609,7 +2609,7 @@
26092609
"@executable_path/Frameworks",
26102610
"@executable_path/../../Frameworks",
26112611
);
2612-
MARKETING_VERSION = 1.37;
2612+
MARKETING_VERSION = 1.36;
26132613
MTL_FAST_MATH = YES;
26142614
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
26152615
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.widgets;
@@ -2655,7 +2655,7 @@
26552655
"@executable_path/Frameworks",
26562656
"@executable_path/../../Frameworks",
26572657
);
2658-
MARKETING_VERSION = 1.37;
2658+
MARKETING_VERSION = 1.36;
26592659
MTL_FAST_MATH = YES;
26602660
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
26612661
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.widgets;
@@ -2697,7 +2697,7 @@
26972697
"@executable_path/Frameworks",
26982698
"@executable_path/../../Frameworks",
26992699
);
2700-
MARKETING_VERSION = 1.37;
2700+
MARKETING_VERSION = 1.36;
27012701
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
27022702
MTL_FAST_MATH = YES;
27032703
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2740,7 +2740,7 @@
27402740
"@executable_path/Frameworks",
27412741
"@executable_path/../../Frameworks",
27422742
);
2743-
MARKETING_VERSION = 1.37;
2743+
MARKETING_VERSION = 1.36;
27442744
MTL_FAST_MATH = YES;
27452745
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
27462746
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.WidgetIntentExtension;
@@ -2783,7 +2783,7 @@
27832783
"@executable_path/Frameworks",
27842784
"@executable_path/../../Frameworks",
27852785
);
2786-
MARKETING_VERSION = 1.37;
2786+
MARKETING_VERSION = 1.36;
27872787
MTL_FAST_MATH = YES;
27882788
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
27892789
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.WidgetIntentExtension;
@@ -2826,7 +2826,7 @@
28262826
"@executable_path/Frameworks",
28272827
"@executable_path/../../Frameworks",
28282828
);
2829-
MARKETING_VERSION = 1.37;
2829+
MARKETING_VERSION = 1.36;
28302830
MTL_FAST_MATH = YES;
28312831
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
28322832
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.WidgetIntentExtension;
@@ -2862,7 +2862,7 @@
28622862
"$(inherited)",
28632863
"@executable_path/Frameworks",
28642864
);
2865-
MARKETING_VERSION = 1.37;
2865+
MARKETING_VERSION = 1.36;
28662866
OTHER_LDFLAGS = (
28672867
"$(inherited)",
28682868
"-ObjC",
@@ -2900,7 +2900,7 @@
29002900
"$(inherited)",
29012901
"@executable_path/Frameworks",
29022902
);
2903-
MARKETING_VERSION = 1.37;
2903+
MARKETING_VERSION = 1.36;
29042904
OTHER_LDFLAGS = (
29052905
"$(inherited)",
29062906
"-ObjC",
@@ -3078,7 +3078,7 @@
30783078
"@executable_path/Frameworks",
30793079
"@executable_path/../../Frameworks",
30803080
);
3081-
MARKETING_VERSION = 1.37;
3081+
MARKETING_VERSION = 1.36;
30823082
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
30833083
MTL_FAST_MATH = YES;
30843084
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3122,7 +3122,7 @@
31223122
"@executable_path/Frameworks",
31233123
"@executable_path/../../Frameworks",
31243124
);
3125-
MARKETING_VERSION = 1.37;
3125+
MARKETING_VERSION = 1.36;
31263126
MTL_FAST_MATH = YES;
31273127
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
31283128
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.OneSignalNotificationServiceExtension;
@@ -3222,7 +3222,7 @@
32223222
"$(inherited)",
32233223
"@executable_path/Frameworks",
32243224
);
3225-
MARKETING_VERSION = 1.37;
3225+
MARKETING_VERSION = 1.36;
32263226
OTHER_LDFLAGS = (
32273227
"$(inherited)",
32283228
"-ObjC",
@@ -3293,7 +3293,7 @@
32933293
"@executable_path/Frameworks",
32943294
"@executable_path/../../Frameworks",
32953295
);
3296-
MARKETING_VERSION = 1.37;
3296+
MARKETING_VERSION = 1.36;
32973297
MTL_FAST_MATH = YES;
32983298
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
32993299
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.OneSignalNotificationServiceExtension;
@@ -3393,7 +3393,7 @@
33933393
"$(inherited)",
33943394
"@executable_path/Frameworks",
33953395
);
3396-
MARKETING_VERSION = 1.37;
3396+
MARKETING_VERSION = 1.36;
33973397
OTHER_LDFLAGS = (
33983398
"$(inherited)",
33993399
"-ObjC",
@@ -3464,7 +3464,7 @@
34643464
"@executable_path/Frameworks",
34653465
"@executable_path/../../Frameworks",
34663466
);
3467-
MARKETING_VERSION = 1.37;
3467+
MARKETING_VERSION = 1.36;
34683468
MTL_FAST_MATH = YES;
34693469
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
34703470
PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.OneSignalNotificationServiceExtension;

0 commit comments

Comments
 (0)